Commit 6fbe6ab0 authored by vaclav's avatar vaclav
Browse files

Merge branch '1209-leftovers-in-ivas-sid-signalling' of... 

Merge branch '1209-leftovers-in-ivas-sid-signalling' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 1209-leftovers-in-ivas-sid-signalling
parents 611a738e 7ab76d69

.gitignore

+0 −87
Original line number Diff line number Diff line
@@ -76,90 +76,3 @@ Externals/ 


# coan output files that are created when cleaning out switches

coan_out_*
 
/COMPLEXITY

/res

/tv

/wmops

/Workspace_msvc/renderer.args.json

/Workspace_msvc/encoder.args.json

/Workspace_msvc/decoder.args.json

/scripts/mem_analysis_enc_VBR_5k9.csv

/scripts/mem_analysis_enc_STEREO_sw.png

/scripts/mem_analysis_enc_STEREO_sw.csv

/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv

*.pwv

/dcr_ism1

/bwe_clicks_ism1

/BWD_issue

/.ipynb_checkpoints

/scripts/.ipynb_checkpoints

/scripts/wmops_analysis

/scripts/wmops_analysis_new

/tcx_hq_problem_ism1

/scripts/dly_error_profiles/dly_profile_19_.dat

/build.txt

/bit.64k

/bit.32k

/bit

/binaural_loudness.ipynb

/tmp.txt

/syn.wav

/syn.ref

/syn.64k.0.csv

/syn.64k

/syn.32k

/stvST32c_-stereo_32000_32.bit

/split_renderer_config_768_3dof_cldfbpc.txt

/split_out_sba_lcld_20ms_out.wav

/split_out_sba_lcld_20ms.pkt

/split_out_mc_lc3plus_20ms_out.wav

/split_out_mc_lc3plus_20ms.pkt

/run_ivas_codec.sh

/report.html

/report-junit.xm

/out.wav

/ltv48_1ISM.cut14.wav.0.csv

/ltv48_1ISM.cut14.pcm

/ltv48_1ISM.cut14.dec.pcm.0.csv

/ltv48_1ISM.cut14.64k.dec.pcm.0.csv

/ltv48_1ISM.cut14.64k.dec.pcm

/ltv48_1ISM.cut14.32k.dec.pcm

/IvasBuilder.txt

/ivas.192

/ism_loudness_stv48_48kHz.md

/ism_loudness_stv48_32kHz.md

/ism_loudness_sel48_48kHz.md

/ism_loudness_old.xlsx

/ism_loudness_ltv48_ISM4.md

/ism_loudness_ltv48_ISM3.md

/ism_loudness_ltv48_ISM2.md

/ism_loudness_ltv48_ISM1.md

/ism_loudness_ltv48_48kHz.md

/ism_loudness.xlsx

/ism_loudness.py

/HOA2_to_BINAURAL_ROOM_REVERBNone_rend_config_combined_20msNone_0-1000_2-500_1-500.wav

/git_blame_string.sh

/get_license_table.py

/enc_out_mc.pkt

/enc_out.pkt

/cut_ism.py

/scripts/Vlad_mergeNewsletters.py

/scripts/Vlad_extract_max_num_ind.py

/scripts/tables_obj.txt

/scripts/tables_exe.txt

/scripts/requirements.txt

/scripts/parseNewsletterWmops.py

/scripts/output.xlsx

/scripts/functions_obj.txt

/scripts/functions_exe.txt

/scripts/dep_tree.txt

/scripts/cmplx_evs_in_ivas.xlsx

/scripts/bit

/scripts/binaural_loudness.ipynb

/scripts/config/Vlad_self_test_ltv.prm

/scripts/config/Vlad_self_test.prm

/scripts/config/Vlad_ci_linux_ltv.json

/scripts/config/Vlad_ci_linux.json

/cmake-build

/bit.fix

/syn

ci/basop-pages/basop_index.html

+7 −0
Original line number Diff line number Diff line
@@ -20,4 +20,11 @@ 


  {}



  <h2>Test Coverage</h2>



  <ul>

    <li><a href="coverage_dec_rend/index.html">Coverage report of Decoder and Renderer</a></li>

    <li><a href="coverage_enc_dec_rend/index.html">Coverage report of Encoder, Decoder and Renderer</a></li>

  </ul>



</body>

ci/complexity_measurements/getWmops.sh

+34 −25
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ 
# the United Nations Convention on Contracts on the International Sales of Goods.



function usage {

    echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)|mem_only}\""

  echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)|mem_only}\" \"repo{float(default)|basop}\" "

  exit 1

}



if [ $# -ne 2 ] && [ $# -ne 3 ]; then

if [ $# -ne 2 ] && [ $# -ne 3 ] && [ $# -ne 4 ]; then

  usage

fi
@@ -41,7 +41,7 @@ ivas_format=$1 
output_format="$2"



mode_arg_script=""

if [ $# -eq 3 ]; then

if [ $# -ge 3 ]; then

  if [ "$3" = "mem_only" ]; then

    mode_arg_script="--wmc_tool_mem_only"

  elif [ "$3" != "full" ]; then
@@ -49,11 +49,20 @@ if [ $# -eq 3 ]; then 
  fi

fi



date=`date +%Y%m%d`                         # used for log-file file ending

shortDate=`date "+%b %d" | sed -e "s/\ /_/g"`    # stored in the log-file

fullDate=`date "+%c" | sed -e "s/\ /_/g"`       # stored in the log-file

repo_arg_script=""

if [ $# -eq 4 ]; then

  if [ "$4" = "basop" ]; then

    repo_arg_script="--basop"

  elif [ "$4" != "float"]; then

    usage

  fi

fi



commit_sha=`git rev-parse --short HEAD`

date=$(date +%Y%m%d)                           # used for log-file file ending

shortDate=$(date "+%b %d" | sed -e "s/\ /_/g") # stored in the log-file

fullDate=$(date "+%c" | sed -e "s/\ /_/g")     # stored in the log-file



commit_sha=$(git rev-parse --short HEAD)



destDir="."

scriptDir="ci/complexity_measurements"
@@ -62,7 +71,8 @@ ep="${scriptDir}/ep_10pct_fer.g192" 
config_file="scripts/config/ci_linux_ltv.json"



# get wmops newsletter

wmopsFilenameFlcLast=wmops_newsletter_stereo__${commit_sha}_${date}

ivas_format_for_filename=${ivas_format// /-}

wmopsFilenameFlcLast=wmops_newsletter_${ivas_format_for_filename}_to_${output_format}__${commit_sha}_${date}

wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast}



ret_val=0
@@ -75,7 +85,7 @@ if [ "$ivas_format" == "OSBA" ]; then 
fi



# instrument and build

./scripts/IvasBuildAndRunChecks.py $mode_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format

./scripts/IvasBuildAndRunChecks.py $mode_arg_script $repo_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format

ret_val=$?



# get the info on worst-case operating point: WMOPS number, enc-operating mode, dec-operating mode
@@ -88,7 +98,6 @@ tcsh ${scriptDir}/genWebpageData_WMOPS.csh ${destDir}/wmops/log_wmops_all.txt ${ 
# per mode graph

tcsh ${scriptDir}/genWebpageData_WmopPerOperatingpoint.csh ${wmopsFilenameFlc}_WMOPS.csv ${destDir}/wmops/graphs_wmops_flc_perOP.js Graphs_WMOPS_perOP





# get memory info for webpage

### RAM

${scriptDir}/mergeNewsletterRam.py ${wmopsFilenameFlc}_HEAP.csv ${wmopsFilenameFlc}_STACK.csv >${wmopsFilenameFlc}_RAM.csv

ci/setup_pages.py

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ JOBS_BASOP_REPO = { 
    "complexity-osba-in-binaural-out": "OSBA in, BINAURAL out",

    "complexity-osba-in-binaural_room_ir-out": "OSBA in, BINAURAL_ROOM_IR out",

    "complexity-stereo-in-stereo-out": "Stereo in, Stereo out",

    # "timeless" jobs (not complexity)

    "coverage-test-on-main-scheduled": "Coverage",

}



JOBS_FOR_PROJECT_ID = {

scripts/IvasBuildAndRunChecks.py

+37 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


import os.path

import sys

import platform



import pyivastest.constants as constants

from pyivastest import IvasScriptsCommon
@@ -39,6 +40,19 @@ from pyivastest.IvasSvnBuilder import * 


RET_CODE_FAILURE = 101



bin_ext = ""

if platform.system() == "Windows":

    bin_ext = ".exe"



default_encdec_bin_path = constants.WC_BASE_DIR

default_enc = os.path.realpath(

    os.path.join(default_encdec_bin_path, "IVAS_cod" + bin_ext)

)

default_dec = os.path.realpath(

    os.path.join(default_encdec_bin_path, "IVAS_dec" + bin_ext)

)

default_out = os.path.join(".", "out")  # change that to something else?





class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript):

    def __init__(self):
@@ -100,9 +114,25 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
            help="pass the '-s' argument to the wmc tool to only measure memory",

            action="store_true",

        )

        self.parser.add_argument(

            "--basop",

            help="build the basop version for instrumentation",

            action="store_true",

        )

        self.parser.add_argument(

            "-e",

            "--enc",

            help="Encoder binary to use instead of instrumenting and building it anew",

            default=None,

        )

        self.parser.add_argument(

            "-d",

            "--dec",

            help="Decoder binary to use instead of instrumenting and building it anew",

            default=None,

        )



    def run(self):



        self.parse_args()

        if self.args["error"] or self.args["exit"]:

            exit()
@@ -142,6 +172,8 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
                sample_rate_dec_out=self.args["srout"],

                enable_logging=True,

                logger_name="{}.br".format(self.logger.name),

                enc_ext=self.args["enc"],

                dec_ext=self.args["dec"],

            )



        elif self.args["srcdir"]:
@@ -152,6 +184,8 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
                sample_rate_dec_out=self.args["srout"],

                enable_logging=True,

                logger_name="{}.br".format(self.logger.name),

                enc_ext=self.args["enc"],

                dec_ext=self.args["dec"],

            )



        modes = self.args["formats"]
@@ -165,6 +199,7 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
                    formats_fname=self.args["format_file"],

                    max_workers=self.args["max_workers"],

                    mem_only=self.args["wmc_tool_mem_only"],

                    basop=self.args["basop"],

                )

            else:

                br.add_check(
@@ -181,7 +216,7 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
                br.build_and_run_dict[check]["analyzer"], self.args

            )



        if self.args["rebuild"] == True:

        if self.args["rebuild"]:

            br.force_build = True



        checks_ret_val = list()