Commit 27ec4e3b authored by BOHMRR's avatar BOHMRR
Browse files

cleanup: removed use_agc_ref

parent a6a6fafe

scripts/ivas_pytests/tests/system_tests/test_spar_foa_bs_enc.py

+4 −26
Original line number Diff line number Diff line
@@ -63,10 +63,7 @@ ivas_br_HOA3 = ['256000', '384000', '512000'] 
sample_rate_list = ['48', '32', '16']

bypass_list = [1, 2]



# we need signals amplified by 24dB - until those are available, use existing 'stvFOA'

agc_tag_list = ['stvFOA']

# TODO: create and use new 24dB signals

# agc_tag_list = ['stvFOA_24dB_']



sample_rate_bw_idx_list = [('48', 'SWB'), ('48', 'WB'), ('32', 'WB')]
@@ -108,7 +105,6 @@ def test_bypass_enc( 
    dtx = '0'

    max_bw = "FB"

    agc = 0

    use_agc_ref = 0

    sba_order = "+1"

    output_config = "FOA"
@@ -126,7 +122,6 @@ def test_bypass_enc( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        sba_order,

        update_ref

    )
@@ -145,7 +140,6 @@ def test_bypass_enc( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        output_config,

        update_ref

    )
@@ -176,7 +170,6 @@ def test_spar_foa_enc_system( 
    max_bw = "FB"

    bypass = -1

    agc = 0

    use_agc_ref = 0

    sba_order = "+1"

    output_config = "FOA"
@@ -194,7 +187,6 @@ def test_spar_foa_enc_system( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        sba_order,

        update_ref

    )
@@ -213,7 +205,6 @@ def test_spar_foa_enc_system( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        output_config,

        update_ref

    )
@@ -240,7 +231,6 @@ def test_spar_hoa2_enc_system( 
#    tag = tag + '_' + fs + 'k'

    max_bw = "FB"

    bypass = -1

    use_agc_ref = 0

    sba_order = "+2"

    output_config = "HOA2"
@@ -258,7 +248,6 @@ def test_spar_hoa2_enc_system( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        sba_order,

        update_ref,

        '.wav'
@@ -278,7 +267,6 @@ def test_spar_hoa2_enc_system( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        output_config,

        update_ref

    )
@@ -305,7 +293,6 @@ def test_spar_hoa3_enc_system( 
#    tag = tag + '_' + fs + 'k'

    max_bw = "FB"

    bypass = -1

    use_agc_ref = 0

    sba_order = "+3"

    output_config = "HOA3"
@@ -323,7 +310,6 @@ def test_spar_hoa3_enc_system( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        sba_order,

        update_ref,

        '.wav'
@@ -343,7 +329,6 @@ def test_spar_hoa3_enc_system( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        output_config,

        update_ref

    )
@@ -372,7 +357,6 @@ def test_spar_foa_enc_BWforce_system( 
    tag = tag + fs + 'c'

    bypass = -1

    agc = 0

    use_agc_ref = 0

    sba_order = "+1"

    output_config = "FOA"
@@ -390,7 +374,6 @@ def test_spar_foa_enc_BWforce_system( 
        bw,

        bypass,

        agc,

        use_agc_ref,

        sba_order,

        update_ref

    )
@@ -409,7 +392,6 @@ def test_spar_foa_enc_BWforce_system( 
        bw,

        bypass,

        agc,

        use_agc_ref,

        output_config,

        update_ref

    )
@@ -438,7 +420,6 @@ def test_spar_foa_enc_agc_system( 
    max_bw = "FB"

    bypass = -1

    agc = 1

    use_agc_ref = 1

    sba_order = "+1"

    output_config = "FOA"
@@ -456,7 +437,6 @@ def test_spar_foa_enc_agc_system( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        sba_order,

        update_ref,

        cut_gain="16.0"
@@ -476,7 +456,6 @@ def test_spar_foa_enc_agc_system( 
        max_bw,

        bypass,

        agc,

        use_agc_ref,

        output_config,

        update_ref

    )
@@ -497,7 +476,6 @@ def spar_foa_enc( 
    ivas_max_bw,

    bypass,

    agc,

    use_agc_ref,

    sba_order,

    update_ref,

    in_extension = '.pcm',
@@ -520,7 +498,7 @@ def spar_foa_enc( 


    tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}"

    short_tag_ext = ""

    if agc == 1 and use_agc_ref == 1:

    if agc == 1:

        short_tag_ext += '_AGC1'

    # we update only bypass = 0/2 (bypass 1 is the same as the baseline)

    if bypass in [0, 2]:
@@ -536,7 +514,8 @@ def spar_foa_enc( 
    dtx_mode = dtx == '1'



    if in_extension == '.pcm':

        # cut input PCM file - currently with fixed (i.e. not test dependant) values

        # use shortened and potentially gain adjusted input PCM file - create if not present

        # cut input PCM file: currently with mostly fixed (i.e. not test dependant) values

        num_channels = "4" # currently only FOA inputs end up, here

        cut_from = "0.0"

        cut_len = "5.0"
@@ -591,7 +570,6 @@ def spar_foa_dec( 
    ivas_max_bw,

    bypass,

    agc,

    use_agc_ref,

    output_config,

    update_ref,

    keep_files=False
@@ -607,7 +585,7 @@ def spar_foa_dec( 
    tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}"



    short_tag_ext = ""

    if agc == 1 and use_agc_ref == 1:

    if agc == 1:

        short_tag_ext += '_AGC1'

    # we update only bypass = 0/2 (bypass 1 is the same as the baseline)

    if bypass in [0, 2]: