Commit fe198d7a authored by Shikha Shetgeri's avatar Shikha Shetgeri
Browse files

Addressing review comments

parent 7e5faecb

tests/test_sba_bs_dec_plc.py

+10 −7
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ tag_list = ['stvFOA'] 
plc_patterns = ['PLperc12mblen5', 'PLperc40mblen50', 'PLperc42mblen2']

dtx_set = ['0', '1']

ivas_br_list = ['13200','16400','32000', '64000', '96000', '256000']

ivas_br_list_1 = ['13200','16400','24400','32000', '64000', '96000', '256000']

sampling_rate_list = ['48', '32', '16']

gain_list = [-1, 0, 1]



AbsTol = '0'
@@ -67,11 +69,12 @@ def check_and_makedir(dir_path): 
# -> the reference generation for this test (reference decoder output) needs to be done after completion of test_sba_enc_system

#    -> therefore the marker create_ref_part2

@pytest.mark.create_ref_part2

@pytest.mark.parametrize("ivas_br", ivas_br_list)

@pytest.mark.parametrize("ivas_br", ivas_br_list_1)

@pytest.mark.parametrize("dtx", dtx_set)

@pytest.mark.parametrize("tag", tag_list)

@pytest.mark.parametrize("plc_pattern", plc_patterns)

@pytest.mark.parametrize("fs", sampling_rate_list)

@pytest.mark.parametrize("gain_flag", gain_list)

def test_sba_plc_system(

    dut_decoder_frontend: DecoderFrontend,

    test_vector_path,
@@ -84,21 +87,21 @@ def test_sba_plc_system( 
    dtx,

    tag,

    plc_pattern,

    fs

    fs,

    gain_flag

):

    SID = 0

    if dtx == '1' and ivas_br not in ['13200','16400','32000', '64000']:

    if dtx == '1' and ivas_br not in ['13200','16400','24400','32000', '64000']:

        # skip high bitrates for DTX until DTX issue is resolved

        pytest.skip()

    if ivas_br == '13200' or ivas_br == '16400':

        if dtx == '1' and fs != '16':

        if dtx == '1' and gain_flag == 0 and fs != '16':

            SID = 1

        else:

            pytest.skip()

    if gain_flag == 1 and ivas_br not in ['13200','16400','24400','32000']:

        pytest.skip()

    tag = tag + fs + 'c'

    gain_flag = -1

    if ivas_br in ['13200','16400','32000']:

        gain_flag = 1



    # dec

    sba_dec_plc(

tests/test_sba_bs_enc.py

+11 −8
Original line number Diff line number Diff line
@@ -57,9 +57,11 @@ dict_bw_tag = {'SWB': '_ForceSWB', 'WB': '_ForceWB'} 
ivas_br_FOA = ['13200','16400','32000','64000', '96000', '160000', '256000', '384000', '512000','sw_24k4_256k.bin']

ivas_br_HOA2 = ['256000', '384000', '512000']

ivas_br_HOA3 = ['256000', '384000', '512000']

ivas_br_list_1 = ['13200','16400','24400','32000','64000', '96000', '160000', '256000', '384000', '512000','sw_24k4_256k.bin']



sample_rate_list = ['48', '32', '16']

bypass_list = [1, 2]

gain_list = [-1, 0, 1]



sample_rate_bw_idx_list = [('48', 'SWB'), ('48', 'WB'), ('32', 'WB')]
@@ -146,10 +148,11 @@ def test_bypass_enc( 




@pytest.mark.create_ref

@pytest.mark.parametrize("ivas_br", ivas_br_FOA)

@pytest.mark.parametrize("ivas_br", ivas_br_list_1)

@pytest.mark.parametrize("dtx", dtx_set)

@pytest.mark.parametrize("tag", tag_list)

@pytest.mark.parametrize("fs", sample_rate_list)

@pytest.mark.parametrize("gain_flag", gain_list)

def test_sba_enc_system(

    dut_encoder_frontend: EncoderFrontend,

    dut_decoder_frontend: DecoderFrontend,
@@ -165,21 +168,21 @@ def test_sba_enc_system( 
    dtx,

    tag,

    fs,

    gain_flag,

):

    SID = 0

    gain_flag = -1

    if ivas_br in ['13200','16400','32000']:

        gain_flag = 1

    if dtx == '1' and ivas_br not in ['13200','16400','32000','64000']:

    if dtx == '1' and ivas_br not in ['13200','16400','24400','32000','64000']:

        # skip high bitrates for DTX until DTX issue is resolved

        pytest.skip()

    if ivas_br == 'sw_24k4_256k.bin':

    if ivas_br == 'sw_24k4_256k.bin' and gain_flag != 1:

        pytest.skip()

    if ivas_br == '13200' or ivas_br == '16400':

        if dtx == '1' and fs != '16':

        if dtx == '1' and gain_flag == 0 and fs != '16':

            SID = 1

        else:

            pytest.skip()

    if gain_flag == 1 and ivas_br not in ['13200','16400','24400','32000']:

        pytest.skip()

    tag = tag + fs + 'c'

    max_bw = "FB"

    bypass = -1
@@ -187,7 +190,7 @@ def test_sba_enc_system( 
    output_config = "FOA"

    if gain_flag == 1:

        cut_gain = "16.0"

    if dtx == '1':

    elif dtx == '1':

        cut_gain = ".004"

    else:

        cut_gain = "1.0"