Commit f9e9c917 authored by Jan Kiene's avatar Jan Kiene
Browse files

use new wrapper function in pca test, no additions yet

parent 50468690
Loading
Loading
Loading
Loading
+112 −45
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ __doc__ = """

import errno
import os
import tempfile
from pathlib import Path

import pytest
from cut_bs import cut_from_start
@@ -96,7 +94,7 @@ def check_and_makedir(dir_path):

@pytest.mark.create_ref
@pytest.mark.parametrize("tag", tag_list)
@pytest.mark.parametrize("fs", sample_rate_list)
@pytest.mark.parametrize("sampling_rate", sample_rate_list)
def test_pca_enc(
    record_property,
    props_to_record,
@@ -110,71 +108,52 @@ def test_pca_enc(
    update_ref,
    keep_files,
    tag,
    fs,
    sampling_rate,
    get_mld,
    get_mld_lim,
    encoder_only,
    decoder_only,
    abs_tol,
    get_ssnr,
    get_odg,
):
    pca = True
    tag = tag + fs + "c"
    ivas_br = "256000"
    dtx = "0"
    max_bw = "FB"
    gain_flag = -1
    tag = tag + sampling_rate + "c"
    bitrate = "256000"
    ivas_max_bw = "FB"
    sba_order = "+1"
    output_config = "FOA"
    br_switch_file_path = None
    cut_testv = True

    if not decoder_only:
        # enc
        sba_enc(
            dut_encoder_frontend,
            test_vector_path,
            ref_encoder_frontend,
            reference_path,
            dut_base_path,
            None,
            tag,
            fs,
            ivas_br,
            dtx,
            None,
            max_bw,
            sba_order,
            update_ref,
            gain_flag,
            keep_files,
            cut_testv=True,
            pca=pca,
        )

    # dec
    sba_dec(
    run_sba(
        record_property,
        props_to_record,
        dut_encoder_frontend,
        dut_decoder_frontend,
        ref_encoder_frontend,
        ref_decoder_frontend,
        test_vector_path,
        reference_path,
        dut_base_path,
        br_switch_file_path,
        tag,
        fs,
        ivas_br,
        dtx,
        None,
        max_bw,
        sampling_rate,
        bitrate,
        ivas_max_bw,
        sba_order,
        output_config,
        update_ref,
        gain_flag,
        keep_files,
        get_mld,
        get_mld_lim,
        abs_tol,
        get_ssnr,
        get_odg,
        encoder_only,
        decoder_only,
        get_mld=get_mld,
        get_mld_lim=get_mld_lim,
        cut_testv=cut_testv,
        pca=pca,
        abs_tol=abs_tol,
        get_ssnr=get_ssnr,
        get_odg=get_odg,
    )


@@ -885,3 +864,91 @@ def sba_dec(
            os.remove(dut_out_raw)
            if not decoder_only and plc_file is None:
                os.remove(dut_in_pkt)


def run_sba(
    record_property,
    props_to_record,
    dut_encoder_frontend,
    dut_decoder_frontend,
    ref_encoder_frontend,
    ref_decoder_frontend,
    test_vector_path,
    reference_path,
    dut_base_path,
    br_switch_file_path,
    tag,
    sampling_rate,
    bitrate,
    ivas_max_bw,
    sba_order,
    output_config,
    update_ref,
    keep_files,
    get_mld,
    get_mld_lim,
    abs_tol,
    get_ssnr,
    get_odg,
    encoder_only,
    decoder_only,
    dtx="0",
    sid=None,
    gain_flag=-1,
    cut_gain="1.0",
    create_dutenc=False,
    cut_testv=False,
    pca=False,
):
    if not decoder_only:
        sba_enc(
            dut_encoder_frontend,
            test_vector_path,
            ref_encoder_frontend,
            reference_path,
            dut_base_path,
            br_switch_file_path,
            tag,
            sampling_rate,
            bitrate,
            dtx,
            sid,
            ivas_max_bw,
            sba_order,
            update_ref,
            gain_flag,
            keep_files,
            cut_gain,
            create_dutenc,
            cut_testv,
            pca,
        )

    if not encoder_only:
        sba_dec(
            record_property,
            props_to_record,
            dut_decoder_frontend,
            ref_decoder_frontend,
            reference_path,
            dut_base_path,
            tag,
            sampling_rate,
            bitrate,
            dtx,
            None,
            ivas_max_bw,
            output_config,
            update_ref,
            gain_flag,
            keep_files,
            decoder_only,
            get_mld=get_mld,
            get_mld_lim=get_mld_lim,
            pca=pca,
            abs_tol=abs_tol,
            get_ssnr=get_ssnr,
            get_odg=get_odg,
        )

    # record properties tbd