Commit 1b60bbc5 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 981-fix-parambin-default-early-part-correction-in-room-reverb
parents 13d793d6 e7620461

ci/complexity_measurements/getWmops.sh

+23 −4
Original line number Diff line number Diff line
@@ -28,15 +28,27 @@ 
# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and

# the United Nations Convention on Contracts on the International Sales of Goods.



# get format from command line

if [ $# -ne 2 ]; then

  echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\""

function usage {

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

  exit 1

}



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

    usage

fi



ivas_format=$1

output_format="$2"



mode_arg_script=""

if [ $# -eq 3 ]; then

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

        mode_arg_script="--wmc_tool_mem_only"

    elif [ "$3" != "full" ]; then

        usage

    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
@@ -55,8 +67,15 @@ wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast} 


ret_val=0



mode_arg=""

# for OSBA, there are just too many modes... -> only select HOA3 ones

if [ "$ivas_format" == "OSBA" ]; then

    osba_hoa3_modes=$(./scripts/runIvasCodec.py -C OSBA -l | grep "HOA3")

    mode_arg="-m $osba_hoa3_modes"

fi



# instrument and build

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

./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

ret_val=$?



# get the info on worst-case operating point: WMOPS number, enc-operating mode, dec-operating mode

ci/setup_pages.py

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ JOBS_FLOAT_REPO = { 
    # current ones

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

    "complexity-ism-in-binaural_room_reverb-out": "ISM in, BINAURAL_ROOM_REVERB out",

    "complexity-ism-in-binaural-out": "ISM in, BINAURAL out",

    "complexity-ism-in-ext-out": "ISM in, EXT out",

    "complexity-sba-hoa3-in-ext-out": "HOA3 in, EXT out",

    "complexity-sba-hoa3-in-binaural_room_ir-out": "HOA3 in, BINAURAL_ROOM_IR out",

lib_com/cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -563,6 +563,10 @@ enum 


#define INT_FS_12k8                         12800                                                                                                            /* internal sampling frequency                */

#define M                                   16                                                                                                               /* order of the LP filter @ 12.8kHz           */

#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT

#define MAX_LP_FILTER_ORDER                 20                                              /* Max order of an LP filter */

#endif



#define L_FRAME                             256                                                                                                              /* frame size at 12.8kHz                      */

#define NB_SUBFR                            4                                                                                                                /* number of subframes per frame              */

#define L_SUBFR                             ( L_FRAME / NB_SUBFR )                                                                                           /* subframe size                              */

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1444,7 +1444,11 @@ typedef enum 
/* LFE PLC */

#define LFE_PLC_BUFLEN                          240

#define LFE_PLC_FS                              1600

#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT

#define L_FRAME_1k6                             ( LFE_PLC_FS / FRAMES_PER_SEC )

#else

#define L_FRAME_1k6                             ( 20 * LFE_PLC_FS / 1000 )

#endif

#define LFE_PLC_LENANA                          LFE_PLC_BUFLEN

#define LFE_PLC_FDEL                            300

lib_com/ivas_prot.h

+5 −1
Original line number Diff line number Diff line
@@ -5496,7 +5496,11 @@ void ivas_lfe_dec( 


void ivas_lfe_tdplc( 

    LFE_DEC_HANDLE hLFE,                                        /* i/o: LFE decoder handle                      */

    const float *prevsynth,                                     /* i  : previous frame synthesis                */

#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT

    float *prevsynth,                                           /* i  : previous frame synthesis                */

#else

    double *prevsynth,                                          /* i  : previous frame synthesis                */

#endif

    float *ytda,                                                /* o  : output time-domain buffer               */

    const int16_t output_frame                                  /* i  : output frame length                     */

);