Commit a74db631 authored by vaclav's avatar vaclav
Browse files

Merge branch 'lfe-plc-precision' of... 

Merge branch 'lfe-plc-precision' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into lfe-plc-precision
parents 113a18f1 93695a80

.gitlab-ci.yml

+69 −24
Original line number Diff line number Diff line
@@ -2297,16 +2297,16 @@ complexity-stereo-in-ext-out: 
    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-ism-in-binaural_room_ir-out:

complexity-ism-in-binaural_room_reverb-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 1 hour

      when: delayed

      start_in: 1 hour

  script:

    - in_format=ISM

    - out_format=BINAURAL_ROOM_IR

    - out_format=BINAURAL_ROOM_REVERB

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts
@@ -2317,8 +2317,8 @@ complexity-ism-in-ext-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 2 hour

      when: delayed

      start_in: 3 hour

  script:

    - in_format=ISM

    - out_format=EXT
@@ -2332,8 +2332,8 @@ complexity-sba-hoa3-in-ext-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 3 hours

      when: delayed

      start_in: 4 hours

  script:

    - in_format=HOA3

    - out_format=EXT
@@ -2347,8 +2347,8 @@ complexity-sba-hoa3-in-binaural_room_ir-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 4 hours

      when: delayed

      start_in: 5 hours

  script:

    - in_format=HOA3

    - out_format=BINAURAL_ROOM_IR
@@ -2362,8 +2362,8 @@ complexity-mc-in-ext-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 5 hours

      when: delayed

      start_in: 6 hours

  script:

    - in_format=MC

    - out_format=EXT
@@ -2377,8 +2377,8 @@ complexity-mc-in-binaural_room_ir-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 6 hours

      when: delayed

      start_in: 7 hours

  script:

    - in_format=MC

    - out_format=BINAURAL_ROOM_IR
@@ -2392,8 +2392,8 @@ complexity-masa-in-ext-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 7 hours

      when: delayed

      start_in: 8 hours

  script:

    - in_format=MASA

    - out_format=EXT
@@ -2407,8 +2407,8 @@ complexity-masa-in-binaural-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 8 hours

      when: delayed

      start_in: 9 hours

  script:

    - in_format=MASA

    - out_format=BINAURAL
@@ -2417,13 +2417,28 @@ complexity-masa-in-binaural-out: 
    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-masa-in-hoa3-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 10 hours

  script:

    - in_format=MASA

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-omasa-in-ext-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 9 hours

      when: delayed

      start_in: 11 hours

  script:

    - in_format=OMASA

    - out_format=EXT
@@ -2437,8 +2452,8 @@ complexity-omasa-in-binaural-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 10 hours

      when: delayed

      start_in: 12 hours

  script:

    - in_format=OMASA

    - out_format=BINAURAL
@@ -2452,8 +2467,8 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      # when: delayed

      # start_in: 11 hours

      when: delayed

      start_in: 13 hours

  script:

    - in_format=StereoDmxEVS

    - out_format=mono
@@ -2462,6 +2477,36 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-osba-in-ext-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 14 hours

  script:

    - in_format=OSBA

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-osba-in-binaural_room_ir-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 15 hours

  script:

    - in_format=OSBA

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



# ---------------------------------------------------------------

# Other jobs

# ---------------------------------------------------------------

ci/setup_pages.py

+14 −9
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ PROJECT_ID_BASOP_REPO = 77 
# job names -> hyperlink strings for the landing page

JOBS_FLOAT_REPO = {

    # old ones no longer running -> replaced by "ext" jobs, remove after some time

    "complexity-stereo-in-stereo-out": "[OLD] Stereo in, stereo out",

    "complexity-ism-in-binaural-out": "[OLD] ISM in, BINAURAL out",

    "complexity-sba-hoa3-in-hoa3-out": "[OLD] HOA3 in, HOA3 out",

    "complexity-mc-in-7_1_4-out": "[OLD] MC in, 7_1_4 out",

    "complexity-masa-in-7_1_4-out": "[OLD] Masa in, 7_1_4 out",

    # "complexity-stereo-in-stereo-out": "[OLD] Stereo in, stereo out",

    # "complexity-sba-hoa3-in-hoa3-out": "[OLD] HOA3 in, HOA3 out",

    # "complexity-mc-in-7_1_4-out": "[OLD] MC in, 7_1_4 out",

    # "complexity-masa-in-7_1_4-out": "[OLD] Masa in, 7_1_4 out",

    # current ones

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

    "complexity-ism-in-binaural_room_ir-out": "ISM in, BINAURAL_ROOM_IR 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",
@@ -29,10 +29,13 @@ JOBS_FLOAT_REPO = { 
    "complexity-mc-in-binaural_room_ir-out": "MC in, BINAURAL_ROOM_IR out",

    "complexity-masa-in-ext-out": "MASA in, EXT out",

    "complexity-masa-in-binaural-out": "MASA in, BINAURAL out",

    "complexity-masa-in-hoa3-out": "MASA in, HOA3 out",

    "complexity-omasa-in-ext-out": "OMASA in, EXT out",

    "complexity-omasa-in-binaural-out": "OMASA in, BINAURAL out",

    # "timeless" jobs (survivors from the old jobs or not complexity)

    "complexity-osba-in-ext-out": "OSBA in, EXT out",

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

    "complexity-StereoDmxEVS-stereo-in-mono-out": "StereoDmxEVS, Stereo in, Mono out",

    # "timeless" jobs (not complexity)

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

}

JOBS_BASOP_REPO = [
@@ -79,6 +82,7 @@ def create_landing_page_float_repo(jobs, index_html): 
    # dynamically create the complexity links on the landing page

    link_html = list()

    link_html = ["<ul>"]



    for job, link_text in jobs.items():

        if job.startswith("complexity"):

            line = f'<li><a href="{job}-public/index.html">{link_text}</a></li>'
@@ -89,9 +93,10 @@ def create_landing_page_float_repo(jobs, index_html): 
    index_pages_tmpl_path = (

        pathlib.Path(__file__).parent.joinpath("index-pages.html").absolute()

    )



    with open(index_pages_tmpl_path) as f:

        index_pages_tmpl = f.read()

    print(index_pages_tmpl)



    index_pages_tmpl = index_pages_tmpl.format(link_html_text)



    with open(index_html, "w") as f:

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

+6 −2
Original line number Diff line number Diff line
@@ -962,14 +962,18 @@ void isp2isf( 
#ifndef NONE_BE_FIX_816_LFE_PLC_FLOAT

void a2rc(

#else

int a2rc(

uint16_t a2rc(

#endif

    const float *a,        /* i  : LPC coefficients            */

    float *refl,           /* o  : Reflection co-efficients    */

    const int16_t lpcorder /* i  : LPC order                   */

)

{

#ifndef NONE_BE_FIX_816_LFE_PLC_FLOAT

    float f[M];

#else

    float f[MAX_LP_FILTER_ORDER];

#endif

    int16_t m, j, n;

    float km, denom, x;
@@ -1015,7 +1019,7 @@ int a2rc( 
#ifndef NONE_BE_FIX_816_LFE_PLC_FLOAT

    return;

#else

    return 0;

    return 1;

#endif

}

lib_com/prot.h

+1 −1
Original line number Diff line number Diff line
@@ -3001,7 +3001,7 @@ void a2isf( 
#ifndef NONE_BE_FIX_816_LFE_PLC_FLOAT

void a2rc(

#else

int a2rc(

uint16_t a2rc(

#endif

    const float *a,        /* i  : LPC coefficients                                */

    float *refl,           /* o  : Reflection co-efficients                        */