Commit 14431b2b authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 116-Bitrate-Switching-in-MC

parents 1aaeca2e 2164800f

.gitlab-ci.yml

+1 −60
Original line number Diff line number Diff line
@@ -1080,74 +1080,15 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
# Other jobs

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





# helper for pages job

.unzip-or-cat: &unzip-or-cat

  - unzip -t $ARTIFACTS >> /dev/null

  - if [ $? -eq 0 ]; then unzip -o $ARTIFACTS; rm $ARTIFACTS; else cat $ARTIFACTS; rm $ARTIFACTS; fi



# job that sets up gitlab pages website

# is run on a separate schedule and collects artifacts from other jobs (currently

# only the complexity measurements) multiple times a day

pages:

  stage: deploy

  tags:

    - ivas-linux

  rules:

    - if: $UPDATE_PAGES

    # TODO: add coverage job

  script:



    - API_URL_BASE=https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs

    - branch=$CI_COMMIT_REF_NAME



    - mkdir public

    - ARTIFACTS=artifacts.zip



    ### fetch artifacts from latest run of complexity jobs

    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-stereo-in-stereo-out)

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-stereo-in-stereo-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-ism-in-binaural-out)

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-ism-in-binaural-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-sba-hoa3-in-hoa3-out)

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-sba-hoa3-in-hoa3-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-mc-in-7_1_4-out)

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-mc-in-7_1_4-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-masa-in-7_1_4-out)

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-masa-in-7_1_4-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-StereoDmxEVS-stereo-in-mono-out)

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-StereoDmxEVS-stereo-in-mono-out-public ./public/



    - cp ci/index-pages.html public/index.html

    - python3 ci/setup_pages.py

  artifacts:

    paths:

      - public

Workspace_msvc/lib_debug.vcxproj

+1 −2
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
    <ClCompile Include="..\lib_debug\debug.c" />

    <ClCompile Include="..\lib_debug\memory.c" />

    <ClCompile Include="..\lib_debug\mem_count.c" />

    <ClCompile Include="..\lib_debug\segsnr.c" />

    <ClCompile Include="..\lib_debug\snr.c" />

    <ClCompile Include="..\lib_debug\sba_debug.c" />

    <ClCompile Include="..\lib_debug\wmops.c" />

apps/renderer.c

+0 −19
Original line number Diff line number Diff line
@@ -62,25 +62,6 @@ 
#include <stdio.h>

#include <string.h>



#ifndef count_malloc

#ifdef RAM_COUNTING_TOOL

#define count_malloc( n1 )     MALLOC_FCT_CALL( n1 )

#define count_calloc( n1, n2 ) CALLOC_FCT_CALL( n1, n2 )

#define count_free( ptr )      FREE_FCT_CALL( ptr )

#else

#define count_malloc( n1 )     malloc( n1 )

#define count_calloc( n1, n2 ) calloc( n1, n2 )

#define count_free( ptr )      free( ptr )

#endif

#endif



#ifndef min

#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )

#endif



#ifndef max

#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )

#endif



#define RENDERER_MAX_CLI_ARG_LENGTH       ( FILENAME_MAX )

#define RENDERER_MAX_METADATA_LENGTH      8192

ci/get_id_of_last_job_occurence.py

+39 −38
Original line number Diff line number Diff line
@@ -38,16 +38,7 @@ PAGE_SUFFIX = "&page={}" 
API_BASE_URL = "https://forge.3gpp.org/rep/api/v4/projects/49"





parser = argparse.ArgumentParser()

parser.add_argument("branch_name")

parser.add_argument("job_name")



args = parser.parse_args()



branch_name = args.branch_name

job_name = args.job_name





def get_job_id(branch_name, job_name):

    job_id = -1

    # check last 500 pipelines max

    for page in range(100):
@@ -78,4 +69,14 @@ for page in range(100): 
        if job_id >= 0:

            break



    return job_id



if __name__ == '__main__':

    parser = argparse.ArgumentParser()

    parser.add_argument("branch_name")

    parser.add_argument("job_name")



    args = parser.parse_args()



    job_id = get_job_id(args.branch_name, args.job_name)

    print(job_id)
 
 No newline at end of file

ci/index-pages.html

+6 −0
Original line number Diff line number Diff line
@@ -16,4 +16,10 @@ 
    <li><a href="complexity-StereoDmxEVS-stereo-in-mono-out-public/index.html">StereoDmxEVS</a></li>

  </ul>



  <h2>Test Coverage</h2>



  <ul>

    <li><a href="coverage/index.html">Coverage report</a></li>

  </ul>



</body>