Commit 2bf48e36 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Fix audio focus tests

parent 2a972eab

tests/rtp/test_rtp.py

+18 −23
Original line number Diff line number Diff line
@@ -102,14 +102,9 @@ def test_rtp_bitstream_evs ( 
    )





#@pytest.mark.parametrize("bitrate", [24400, 80000, 512000])

#@pytest.mark.parametrize("bandwidth", ["WB", "SWB", "FB"])

#@pytest.mark.parametrize("format", ["STEREO", "SBA", "MC", "MASA"])

#@pytest.mark.parametrize("framesPerPacket", [8])



@pytest.mark.parametrize("bitrate", [24400])

@pytest.mark.parametrize("bandwidth", ["SWB"])

@pytest.mark.parametrize("format", ["MASA"])

@pytest.mark.parametrize("bitrate", [24400, 80000, 512000])

@pytest.mark.parametrize("bandwidth", ["WB", "SWB", "FB"])

@pytest.mark.parametrize("format", ["STEREO", "SBA", "MC", "MASA"])

@pytest.mark.parametrize("framesPerPacket", [8])

def test_rtp_bitstream_ivas_nodtx (

    test_info,
@@ -176,17 +171,17 @@ def generatePiData(startTs: int, endTs: int) -> dict: 


    for ts in range(startTs, endTs, 320):

        pidata = dict()

        #pidata["SCENE_ORIENTATION"] = someOrientation()

        #pidata["DEVICE_ORIENTATION_COMPENSATED"] = someOrientation()

        #pidata["DEVICE_ORIENTATION_UNCOMPENSATED"] = someOrientation()

        #pidata["PLAYBACK_DEVICE_ORIENTATION"] = someOrientation()

        #pidata["HEAD_ORIENTATION"] = someOrientation()

        pidata["SCENE_ORIENTATION"] = someOrientation()

        pidata["DEVICE_ORIENTATION_COMPENSATED"] = someOrientation()

        pidata["DEVICE_ORIENTATION_UNCOMPENSATED"] = someOrientation()

        pidata["PLAYBACK_DEVICE_ORIENTATION"] = someOrientation()

        pidata["HEAD_ORIENTATION"] = someOrientation()

        pidata["AUDIO_FOCUS_REQUEST"] = random.choice(someAuFocusList)()

        #pidata["LISTENER_POSITION"] = somePosition()

        #pidata["DYNAMIC_AUDIO_SUPPRESSION"] = someDAS()

        #pidata["AUDIO_DESCRIPTION"] = [someDesc() for n in range(random.randint(1, 5))]

        #pidata["DIEGETIC_TYPE"] = someDIG()

        #pidata["ACOUSTIC_ENVIRONMENT"] = ACOUSTIC_ENVIRONMENT(aeid=random.randint(0, 127))

        pidata["LISTENER_POSITION"] = somePosition()

        pidata["DYNAMIC_AUDIO_SUPPRESSION"] = someDAS()

        pidata["AUDIO_DESCRIPTION"] = [someDesc() for n in range(random.randint(1, 5))]

        pidata["DIEGETIC_TYPE"] = someDIG()

        pidata["ACOUSTIC_ENVIRONMENT"] = ACOUSTIC_ENVIRONMENT(aeid=random.randint(0, 127))

        data[str(ts)] = pidata

    return data
@@ -238,10 +233,10 @@ def isEqualAudioFocus(ref: AUDIO_FOCUS, dut: AUDIO_FOCUS): 
        assert ref.direction is not None, "Audio Focus PI Data missing direction"

        assert dut.direction is not None, "Audio Focus PI Data missing direction"

    if ref.direction is not None and dut.direction is not None:

        assert abs(ref.direction.w - dut.direction.w) < 0.0001, "Audio Focus PI Data mismatch in direction w"

        assert abs(ref.direction.x - dut.direction.x) < 0.0001, "Audio Focus PI Data mismatch in direction x"

        assert abs(ref.direction.y - dut.direction.y) < 0.0001, "Audio Focus PI Data mismatch in direction y"

        assert abs(ref.direction.z - dut.direction.z) < 0.0001, "Audio Focus PI Data mismatch in direction z"

        assert abs(ref.direction['w'] - dut.direction.w) < 0.0001, "Audio Focus PI Data mismatch in direction w"

        assert abs(ref.direction['x'] - dut.direction.x) < 0.0001, "Audio Focus PI Data mismatch in direction x"

        assert abs(ref.direction['y'] - dut.direction.y) < 0.0001, "Audio Focus PI Data mismatch in direction y"

        assert abs(ref.direction['z'] - dut.direction.z) < 0.0001, "Audio Focus PI Data mismatch in direction z"

    assert ref.level == dut.level, "Audio Focus PI Data mismatch in level"



class CSVREADER:
@@ -467,7 +462,7 @@ def run_rtp_bitstream_tests ( 
                        isEqualDiegetic(DIEGETIC_TYPE(**decoded), data)

                    elif type(generatedPIData[ts][pitype]) == ACOUSTIC_ENVIRONMENT:

                        isEqualAcousticEnv(ACOUSTIC_ENVIRONMENT(**decoded), data)

                    if type(generatedPIData[ts][pitype]) == AUDIO_FOCUS:

                    elif type(generatedPIData[ts][pitype]) == AUDIO_FOCUS:

                        isEqualAudioFocus(AUDIO_FOCUS(**decoded), data)

                    elif type(generatedPIData[ts][pitype]) == list:

                        for r, d in zip(generatedPIData[ts][pitype], decodedPiData[ts][pitype]):