Commit f6ba5056 authored by vaclav's avatar vaclav
Browse files

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

Merge remote-tracking branch 'remotes/origin/main' into 1225-disclaimer-missing-for-renderer-and-post-renderer
parents bb4bc818 a6427733

.gitlab-ci.yml

+54 −32
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ variables: 
      - 'test-long-self-test'

      - 'ivas-conformance'

      - 'ivas-conformance-linux'

      - 'check-float-reference'

      - 'check-clipping'

      - 'test-branch-vs-input-passthrough'
@@ -70,9 +69,6 @@ workflow: 
      variables:

        IVAS_PIPELINE_NAME: 'Draft IVAS Conformance test -- Linux: $CI_COMMIT_BRANCH'        

    - if: $CI_PIPELINE_SOURCE == 'trigger'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'check-float-reference'

      variables:

        IVAS_PIPELINE_NAME: 'check-float-reference: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'check-clipping'

      variables:

        IVAS_PIPELINE_NAME: 'Check core input clipping: $CI_COMMIT_BRANCH'
@@ -277,8 +273,6 @@ stages: 
      when: never      

    - if: $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'

      when: never      

    - if: $MANUAL_PIPELINE_TYPE == 'check-float-reference'

      when: never

    - if: $MANUAL_PIPELINE_TYPE == 'check-clipping'

    - if: $MANUAL_PIPELINE_TYPE == 'test-branch-vs-input-passthrough'

      when: never
@@ -421,6 +415,16 @@ check-self-test-names-pre: 
  script:

    - python3 ci/check_self_test_names.py scripts/config/self_test.prm 135



check-no-duplicates-in-self-tests:

  extends:

    - .rules-merge-request

  stage: prevalidate

  needs: []

  tags:

    - ivas-linux

  script:

    - python3 ci/find_duplicates_in_prm_files.py



branch-is-up-to-date-with-main-post:

  extends:

    - .rules-merge-request
@@ -432,8 +436,7 @@ branch-is-up-to-date-with-main-post: 
    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update." exit 1; fi;



# for merges to basop-ci-branch, run the long test suite in reference generation mode to catch problems already here and not only in the BASOP repo

check-compatibility-with-basop-reference-branch:

.basop-ci-branch-compat-template:

  extends:

    - .test-job-linux

  rules:
@@ -441,46 +444,66 @@ check-compatibility-with-basop-reference-branch: 
      changes:

        - tests/**/*

        - scripts/**/*

        - ci/**/*

    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'check-float-reference'

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

  tags:

    - ivas-linux-fast

  script:

  before_script:

    - git clone -b $BASOP_REFERENCE_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch

    - make -j -C ivas-basop

    - cp ivas-basop/IVAS_cod ./IVAS_cod_ref

    - cp ivas-basop/IVAS_dec ./IVAS_dec_ref

    - cp ivas-basop/IVAS_cod ./IVAS_cod # Not used but needed to launch the pytest

    - cp ivas-basop/IVAS_dec ./IVAS_dec # Not used but needed to launch the pytest

    - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm

    - python3 ci/remove_unsupported_testcases.py $PARAM_FILE

    - python3 tests/create_short_testvectors.py

    - *update-ltv-repo

    - *copy-ltv-files-to-testv-dir



    - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test.prm -v --update_ref 1 --html=report-selftest-full.html --self-contained-html --junit-xml=report-junit-selftest-full.xml || true

    - zero_errors=$(cat report-junit-selftest-full.xml | grep -c 'errors="0"') || true

    - if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test.prm !"; exit $EXIT_CODE_FAIL; fi



    - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_basop_encoder.prm -v --update_ref 1 --html=report-selftest-basop-encoder.html --self-contained-html --junit-xml=report-junit-selftest-basop-encoder.xml || true

    - zero_errors=$(cat report-junit-selftest-basop-encoder.xml | grep -c 'errors="0"') || true

    - if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test_basop_encoder.prm !"; exit $EXIT_CODE_FAIL; fi

    - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file $PARAM_FILE --update_ref 1 --ref_encoder_path ivas-basop/IVAS_cod --ref_decoder_path ivas-basop/IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml || true

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true

    - if [ $zero_errors != 1 ]; then echo "Run errors encountered with $PARAM_FILE !"; exit $EXIT_CODE_FAIL; fi



    - exit 0

  artifacts:

    name: "check-float-reference--sha-$CI_COMMIT_SHORT_SHA--results"

    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"

    when: always

    expire_in: 1 month

    paths:

      - report-junit-selftest-full.xml

      - report-junit-selftest-basop-encoder.xml

      - report-selftest-full.html

      - report-selftest-basop-encoder.html

      - report-junit.xml

      - report.html



    expose_as: "check-float-reference results"

    reports:

      junit:

        - report-junit-selftest-full.xml

        - report-junit-selftest-basop-encoder.xml

        - report-junit.xml



check-compatibility-with-basop-reference-branch-stv:

  extends:

    - .basop-ci-branch-compat-template

  variables:

    PARAM_FILE: scripts/config/self_test.prm

  script:

    - exit 0



check-compatibility-with-basop-reference-branch-ltv:

  extends:

    - .basop-ci-branch-compat-template

  variables:

    PARAM_FILE: scripts/config/self_test_ltv.prm

  script:

    - exit 0



check-compatibility-with-basop-reference-branch-encoder-stv:

  extends:

    - .basop-ci-branch-compat-template

  variables:

    PARAM_FILE: scripts/config/self_test_basop_encoder.prm

  script:

    - exit 0



check-compatibility-with-basop-reference-branch-encoder-ltv:

  extends:

    - .basop-ci-branch-compat-template

  variables:

    PARAM_FILE: scripts/config/self_test_ltv_basop_encoder.prm

  script:

    - exit 0



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

# Build jobs
@@ -515,7 +538,6 @@ build-codec-instrumented-linux: 
  timeout: "10 minutes"

  script:

    - *print-common-info

    - *activate-Werror-linux

    - ./scripts/prepare_instrumentation.sh

    - make -j -C scripts/c-code_instrument

apps/decoder.c

+1 −76
Original line number Diff line number Diff line
@@ -160,9 +160,6 @@ typedef struct 
    char *hrtfFileName;



    IVAS_DEC_HRTF_HANDLE *hHrtfTD;

#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF;

#endif



    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics;
@@ -171,12 +168,7 @@ typedef struct 
    IVAS_BIN_RENDERER_TYPE binaural_renderer_sec;

    IVAS_BIN_RENDERER_TYPE binaural_renderer_sec_old;



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

    IVAS_AUDIO_CONFIG hrtf_set_audio_cfg;

#else

    IVAS_AUDIO_CONFIG intern_audio_config;

    int16_t room_reverb_flag;

#endif



} IVAS_DEC_HRTF_BINARY_WRAPPER;
@@ -189,11 +181,7 @@ static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg ); 
static void usage_dec( void );

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );

#else

static ivas_error IVAS_DEC_LoadHrtfFromFile( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const int32_t output_Fs );

#endif

#ifdef DEBUGGING

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );

static int16_t app_own_random( int16_t *seed );
@@ -248,9 +236,6 @@ int main( 
#endif



    hHrtfBinary.hHrtfTD = NULL;         /* just to avoid compilation warning */

#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM

    hHrtfBinary.hSetOfHRTF = NULL; /* just to avoid compilation warning */

#endif

    hHrtfBinary.hHrtfStatistics = NULL; /* just to avoid compilation warning */



    splitRendBits.bits_buf = splitRendBitsBuf;
@@ -734,12 +719,7 @@ int main( 
        hHrtfBinary.hrtfFileName = arg.hrtfFileName;

        hHrtfBinary.binaural_renderer = IVAS_BIN_RENDERER_TYPE_NONE;

        hHrtfBinary.binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_NONE;

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

        hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;

#else

        hHrtfBinary.room_reverb_flag = 0;

        hHrtfBinary.intern_audio_config = IVAS_AUDIO_CONFIG_INVALID;

#endif

    }



    /*------------------------------------------------------------------------------------------*
@@ -818,9 +798,6 @@ cleanup: 
    if ( arg.hrtfReaderEnabled )

    {

        destroy_td_hrtf( hHrtfBinary.hHrtfTD );

#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM

        destroy_SetOfHRTF( hHrtfBinary.hSetOfHRTF );

#endif

        destroy_hrtf_statistics( hHrtfBinary.hHrtfStatistics );

    }
@@ -2372,11 +2349,7 @@ static ivas_error decodeG192( 
                /* Read main parameters from the bitstream to set-up the decoder */

                hHrtfBinary->binaural_renderer_old = hHrtfBinary->binaural_renderer;

                hHrtfBinary->binaural_renderer_sec_old = hHrtfBinary->binaural_renderer_sec;

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtfBinary->binaural_renderer, &hHrtfBinary->binaural_renderer_sec, &hHrtfBinary->hrtf_set_audio_cfg ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtfBinary->binaural_renderer, &hHrtfBinary->binaural_renderer_sec, &hHrtfBinary->room_reverb_flag, &hHrtfBinary->intern_audio_config ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }
@@ -2387,11 +2360,7 @@ static ivas_error decodeG192( 
                /* Load HRTF binary file data */

                if ( arg.hrtfReaderEnabled )

                {

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

                    if ( ( error = load_hrtf_from_file( hHrtfBinary, hIvasDec, arg.outputConfig, arg.output_Fs ) ) != IVAS_ERR_OK )

#else

                    if ( ( error = IVAS_DEC_LoadHrtfFromFile( hHrtfBinary, hIvasDec, arg.output_Fs ) ) != IVAS_ERR_OK )

#endif

                    {

                        fprintf( stderr, "\nIVAS_DEC_LoadHrtfFromFile failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                        goto cleanup;
@@ -3287,11 +3256,7 @@ static ivas_error decodeVoIP( 
                /* Read main parameters from the bitstream to set-up the decoder */

                hHrtf->binaural_renderer_old = hHrtf->binaural_renderer;

                hHrtf->binaural_renderer_sec_old = hHrtf->binaural_renderer_sec;

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtf->binaural_renderer, &hHrtf->binaural_renderer_sec, &hHrtf->hrtf_set_audio_cfg ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtf->binaural_renderer, &hHrtf->binaural_renderer_sec, &hHrtf->room_reverb_flag, &hHrtf->intern_audio_config ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }
@@ -3302,11 +3267,7 @@ static ivas_error decodeVoIP( 
                /* Load HRTF binary file data */

                if ( arg.hrtfReaderEnabled )

                {

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

                    if ( ( error = load_hrtf_from_file( hHrtf, hIvasDec, arg.outputConfig, arg.output_Fs ) ) != IVAS_ERR_OK )

#else

                    if ( ( error = IVAS_DEC_LoadHrtfFromFile( hHrtf, hIvasDec, arg.output_Fs ) ) != IVAS_ERR_OK )

#endif

                    {

                        fprintf( stderr, "\nIVAS_DEC_LoadHrtfFromFile failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                        goto cleanup;
@@ -3697,7 +3658,6 @@ static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( 
#endif





#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

/*---------------------------------------------------------------------*

 * load_hrtf_from_file()

 *
@@ -3710,18 +3670,6 @@ static ivas_error load_hrtf_from_file( 
    const IVAS_AUDIO_CONFIG OutputConfig,      /* i  : output audio configuration   */

    const int32_t output_Fs                    /* i  : output sampling rate         */

)

#else

/*---------------------------------------------------------------------*

 * IVAS_DEC_LoadHrtfFromFile()

 *

 *

 *---------------------------------------------------------------------*/



static ivas_error IVAS_DEC_LoadHrtfFromFile(

    IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary,

    IVAS_DEC_HANDLE hIvasDec,

    const int32_t output_Fs )

#endif

{

    ivas_error error;

    IVAS_BIN_RENDERER_TYPE binaural_renderer, binaural_renderer_sec;
@@ -3747,13 +3695,6 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( 
            destroy_td_hrtf( hHrtfBinary->hHrtfTD );

        }



#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM

        if ( !( binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND || binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT ) && hHrtfBinary->hSetOfHRTF != NULL )

        {

            destroy_SetOfHRTF( hHrtfBinary->hSetOfHRTF );

        }



#endif

        if ( ( error = IVAS_DEC_HRTF_binary_close( hIvasDec, hHrtfBinary->binaural_renderer_old ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -3801,22 +3742,14 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( 


        if ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND || binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT )

        {

#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM

            IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;

            if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hHrtfCrend ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hHrtfBinary->hSetOfHRTF ) ) != IVAS_ERR_OK )

#endif

            {

                fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                return error;

            }



#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM

            if ( ( error = load_Crend_HRTF_from_binary( *hHrtfCrend, hHrtfBinary->hrtfReader, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, output_Fs ) ) != IVAS_ERR_OK )

#else

            if ( ( error = create_SetOfHRTF_from_binary( *hHrtfBinary->hSetOfHRTF, hHrtfBinary->hrtfReader, output_Fs ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {
@@ -3825,11 +3758,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( 
                }

                else

                {

#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM

                    destroy_crend_hrtf( hHrtfCrend );

#else

                    destroy_SetOfHRTF( hHrtfBinary->hSetOfHRTF );

#endif

                }

            }

        }
@@ -3843,11 +3772,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( 
                return error;

            }



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hHrtfBinary->room_reverb_flag, hHrtfBinary->intern_audio_config, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {

apps/renderer.c

+0 −25
Original line number Diff line number Diff line
@@ -665,11 +665,7 @@ int main( 
    SplitRendBFIFileReader *splitRendBFIReader = NULL;

    Vector3PairFileReader *referenceVectorReader = NULL;

    hrtfFileReader *hrtfFileReader = NULL;

#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM

    IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;

#else

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#endif

    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
@@ -975,17 +971,12 @@ int main( 
            }





#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM

            if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hHrtfCrend ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )

#endif

            {

                fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed: %s\n\n", ivas_error_to_string( error ) );

                goto cleanup;

            }



#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM

            IVAS_AUDIO_CONFIG hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_7_1_4;

            if ( args.inConfig.ambisonicsBuses->audioConfig != IVAS_AUDIO_CONFIG_INVALID && args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

            {
@@ -993,9 +984,6 @@ int main( 
            }



            if ( ( error = load_Crend_HRTF_from_binary( *hHrtfCrend, hrtfFileReader, args.outConfig.audioConfig, hrtf_set_audio_cfg, args.sampleRate ) ) != IVAS_ERR_OK )

#else

            if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {
@@ -1004,11 +992,7 @@ int main( 
                }

                else

                {

#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM

                    destroy_crend_hrtf( hHrtfCrend );

#else

                    destroy_SetOfHRTF( hSetOfHRTF );

#endif

                }

            }
@@ -1018,11 +1002,7 @@ int main( 
                goto cleanup;

            }



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig, hrtfFileReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, 0, IVAS_AUDIO_CONFIG_INVALID, hrtfFileReader ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {
@@ -2029,9 +2009,6 @@ cleanup: 


    Vector3PairFileReader_close( &referenceVectorReader );

    destroy_td_hrtf( hHrtfTD );

#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM

    destroy_SetOfHRTF( hSetOfHRTF );

#endif

    destroy_hrtf_statistics( hHrtfStatistics );

    IVAS_REND_Close( &hIvasRend );

    IsmPositionProvider_close( positionProvider );
@@ -2574,9 +2551,7 @@ static CmdlnArgs defaultArgs( 
    args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;

    args.outConfig.outSetupCustom.num_spk = 0;

    args.outConfig.outSetupCustom.num_lfe = 0;

#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM

    args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;

#endif



    for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )

    {

ci/complexity_measurements/getWmops.sh

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 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" | grep -v "planar")

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

  mode_arg="-m $osba_hoa3_modes"

fi

ci/find_duplicates_in_prm_files.py

0 → 100644
+66 −0
Original line number Diff line number Diff line 
from collections import Counter

from pathlib import Path

import sys

import pprint



HERE = Path(__file__).parent

CONFIGS_DIR = HERE.parent.joinpath("scripts/config")



PRM_FILES = [

    CONFIGS_DIR.joinpath("self_test.prm"),

    CONFIGS_DIR.joinpath("self_test_ltv.prm"),

    CONFIGS_DIR.joinpath("self_test_basop_encoder.prm"),

    CONFIGS_DIR.joinpath("self_test_ltv_basop_encoder.prm"),

]





def main() -> bool:

    duplicates_found = False

    for prm_file in PRM_FILES:

        with open(prm_file) as f:

            contents = f.read()



        # first check if there are complete duplicates (i.e. comment line, encoder cmd and decoder cmd are the same)

        # for "basop_encoder" files, we only need to check for encoder command duplicates

        if "basop_encoder" in prm_file.name:

            lines = contents.split("\n")

            encoder_lines = [l for l in lines if "IVAS_cod" in l]

            encoder_counter = Counter(encoder_lines)

            testcase_duplicates = [l for l in encoder_counter if encoder_counter[l] > 1]

        else:

            blocks = contents.split("\n\n")

            blocks = [b for b in blocks if len(b.strip()) > 0]

            blocks_counter = Counter(blocks)

            testcase_duplicates = [

                b.split("\n")[0] for b in blocks_counter if blocks_counter[b] > 1

            ]



        # also check if there are duplicates in the command names only

        lines = contents.split("\n")

        commands_lines = [

            l

            for l in lines

            if l.strip().startswith("//")

            and "IVAS_cod" not in l

            and "IVAS_dec" not in l

        ]

        commands_counter = Counter(commands_lines)

        commands_duplicates = [l for l in commands_counter if commands_counter[l] > 1]



        if len(testcase_duplicates) > 0:

            duplicates_found = True

            print(f"Duplicate testcases in {prm_file.name} found:")

            pprint.pp(testcase_duplicates)



        if len(commands_duplicates) > 0:

            duplicates_found = True

            print(f"Duplicate command names in {prm_file.name} found:")

            pprint.pp(commands_duplicates)



        print()



    return duplicates_found





if __name__ == "__main__":

    sys.exit(int(main()))