Commit 5bb44f9e authored by vaclav's avatar vaclav
Browse files

- Merge branch 'float-pc' into 1357_ref_PortFlpMR1258

parents 2a5ac5d6 2ab06e2f

.gitlab-ci.yml

+13 −9
Original line number Diff line number Diff line
@@ -291,6 +291,10 @@ stages: 
  - (Get-Content -Path "CMakeLists.txt") -replace '# \(add_compile_options\("\/WX"\)\)', '$1' | Set-Content -Path "CMakeLists.txt"

  - Get-ChildItem -Path "Workspace_msvc" -Filter "*.vcxproj" | ForEach-Object { (Get-Content -Path $_.FullName) -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' | Set-Content -Path $_.FullName }



.remove_unsupported_testcases: &remove_unsupported_testcases

  # Note: the --use-main-pc-set arg should only be used on main-pc and float-pc branches

  - python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set



# From float repo

# to be reused in MR and LTV-scheduled sanitizer test jobs

# set CLANG_NUM, SELFTEST_SANITY_TIMEOUT and SELF_TEST_PRM_FILE in before_script section
@@ -304,7 +308,7 @@ stages: 
    - testcase_timeout=$SELFTEST_SANITY_TIMEOUT

    - export UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases



    - exit_code20=0

    - exit_code10=0
@@ -548,7 +552,7 @@ stages: 
    -    testcase_timeout=$TESTCASE_TIMEOUT_STV

    - fi



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases

    - if [ $LEVEL_SCALING != "1.0" ];then

    -   *apply-testv-scaling

    - fi
@@ -634,7 +638,7 @@ stages: 
    -    testcase_timeout=$TESTCASE_TIMEOUT_STV

    - fi



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases

    - if [ $LEVEL_SCALING != "1.0" ];then

    -   *apply-testv-scaling

    - fi
@@ -746,7 +750,7 @@ stages: 
  script:

    - *print-common-info

    - *update-scripts-repo

    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases

    - *build-reference-and-dut-binaries

    - make clean

    - make -j CLANG=$CLANG_NUM
@@ -782,7 +786,7 @@ stages: 
    -    testcase_timeout=$TESTCASE_TIMEOUT_STV

    - fi



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases

    - if [ $LEVEL_SCALING != "1.0" ];then

    -   *apply-testv-scaling

    - fi
@@ -977,7 +981,7 @@ check-first-frame-is-sid: 
    - bash ci/run-first-frame-is-sid-test.sh



# from float

check-bitexactness-hrtf-rom-and-file:

.check-bitexactness-hrtf-rom-and-file:

  extends:

    - .test-job-linux

    - .rules-merge-request-to-float-pc
@@ -1780,7 +1784,7 @@ codec-smoke-test: 
    - cp IVAS_cod IVAS_cod_ref

    - cp IVAS_dec IVAS_dec_ref



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases

    # create references

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1

    ### run pytest
@@ -2009,7 +2013,7 @@ ivas-pytest-on-merge-request: 
    - *get-commits-behind-count

    - *check-commits-behind-count-in-compare-jobs

    - *merge-request-comparison-setup-codec

    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    # write to temporary file as workaround for failures observed with piping echo
@@ -2069,7 +2073,7 @@ ivas-interop-on-merge-request: 
    # the next line is dependent on ref-using-main flag in the other tests, but here the flag does not make sense

    - git checkout $source_branch_commit_sha



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    # write to temporary file as workaround for failures observed with piping echo

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#        cmake --build . --config Release





cmake_minimum_required(VERSION 3.1)

cmake_minimum_required(VERSION 3.10)



set(CMAKE_C_STANDARD 99)
@@ -121,7 +121,7 @@ if(WMOPS) 
  add_definitions("-DWMOPS=1")

endif()



project(stereo-evs)

project(stereo-evs LANGUAGES C)

set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer

include(CTest)

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static const CmdLnParser_Option cliOptions[] = { 
      .description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" },

    {

        .id = CmdLnOptionId_noDelayCmp,

        .match = "no_delay_comparison",

        .match = "no_delay_compensation",

        .matchShort = "no_delay_cmp",

        .description = "[flag] Turn off delay compensation",

    },

lib_com/ivas_dirac_com.c

+33 −7
Original line number Diff line number Diff line
@@ -195,11 +195,19 @@ ivas_error ivas_dirac_config( 


    if ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT )

    {

#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

        ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band, hFbMdft, 1 );

#else

        ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band, hFbMdft );

#endif

    }

    else

    {

#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

        ivas_dirac_config_bands( band_grouping, hConfig->nbands, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), NULL, 0, 0, hFbMdft, 1 );

#else

        ivas_dirac_config_bands( band_grouping, hConfig->nbands, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), NULL, 0, 0, hFbMdft );

#endif

    }



    return error;
@@ -207,11 +215,22 @@ ivas_error ivas_dirac_config( 




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

 * ivas_dirac_sba_config_bands()

 * ivas_dirac_config_bands()

 *

 * DirAC Configuration freq. band function; used also in MASA decoder

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



#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

void ivas_dirac_config_bands(

    int16_t *band_grouping, /* o  : band grouping                          */

    const int16_t nbands,   /* i  : number of bands                        */

    const int16_t max_band, /* i  : maximal band index +1                  */

    int16_t *dirac_to_spar_md_bands,

    const int8_t useLowerBandRes,

    const int16_t enc_param_start_band,

    IVAS_FB_MIXER_HANDLE hFbMdft,

    const int8_t BandGroupLowRes )

#else

void ivas_dirac_config_bands(

    int16_t *band_grouping, /* o  : band grouping                          */

    const int16_t nbands,   /* i  : number of bands                        */
@@ -220,6 +239,7 @@ void ivas_dirac_config_bands( 
    const int8_t useLowerBandRes,

    const int16_t enc_param_start_band,

    IVAS_FB_MIXER_HANDLE hFbMdft )

#endif

{

    int16_t i;

    {
@@ -270,6 +290,10 @@ void ivas_dirac_config_bands( 
            {

                int16_t step = DIRAC_LOW_BANDRES_STEP;

                int16_t reduced_band;

#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

                if ( BandGroupLowRes )

#endif

                {

                    for ( band = enc_param_start_band + 2, reduced_band = enc_param_start_band + 1; band <= DIRAC_MAX_NBANDS; band += step, reduced_band++ )

                    {

                        band_grouping[reduced_band] = band_grouping[band];
@@ -278,6 +302,8 @@ void ivas_dirac_config_bands( 
                    {

                        band_grouping[reduced_band] = max_band;

                    }

                }



                for ( band = enc_param_start_band + ( DIRAC_MAX_NBANDS - enc_param_start_band ) / 2 - 1, reduced_band = DIRAC_MAX_NBANDS - 1; band >= enc_param_start_band; band--, reduced_band -= step )

                {

                    dirac_to_spar_md_bands[reduced_band] = dirac_to_spar_md_bands[band];

lib_com/ivas_prot.h

+22 −0
Original line number Diff line number Diff line
@@ -2958,6 +2958,13 @@ int16_t check_bounds_s( 
    const int16_t high                                          /* i  : High limit                              */

);



#ifdef FIX_CRASH_LONG_BRIR

void set_zero_l(

    float *vec,         /* o  : input vector                                    */

    const uint32_t lvec /* i  : length of the vector                            */

);

#endif



ivas_error stereo_memory_enc(

    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure                   */

    const int32_t input_Fs,                                     /* i  : input sampling rate                     */
@@ -3662,6 +3669,18 @@ ivas_error ivas_dirac_config( 
    const int16_t enc_dec                                       /* i  : encoder or decoder flag                 */

);



#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

void ivas_dirac_config_bands(

    int16_t *band_grouping,                                     /* o  : band grouping                           */

    const int16_t nbands,                                       /* i  : number of bands                         */ 

    const int16_t max_band,                                     /* i  : maximal band index +1                   */

    int16_t *dirac_to_spar_md_bands,                            /* o  : mapping of DirAC parameter band index to SPAR FB band index */

    const int8_t useLowerBandRes,                               /* i  : flag indicating lower band resolution for DirAC             */

    const int16_t enc_param_start_band,                         /* i  : band index of first DirAC parameter band                    */

    IVAS_FB_MIXER_HANDLE hFbMdft,                               /* i  : MDFT filterbank handle                                      */ 

    const int8_t BandGroupLowRes                                /* i  : flag indicating lower band grouping resolution for DirAC    */

);

#else

void ivas_dirac_config_bands(

    int16_t *band_grouping,                                     /* o  : band grouping                           */

    const int16_t nbands,                                       /* i  : number of bands                         */
@@ -3671,6 +3690,7 @@ void ivas_dirac_config_bands( 
    const int16_t enc_param_start_band,                         /* i  : band index of first DirAC parameter band                    */

    IVAS_FB_MIXER_HANDLE hFbMdft

);

#endif



void ivas_get_dirac_sba_max_md_bits(

    const int32_t sba_total_brate,
@@ -5883,11 +5903,13 @@ ivas_error ivas_td_binaural_open( 
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);



#ifndef FIX_910_REMOVE_DUPLICATION_TD_REND

ivas_error ivas_td_binaural_renderer(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */

    float *output[],                                            /* i/o: SCE channels / Binaural synthesis       */

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

);

#endif



ivas_error ivas_td_binaural_renderer_sf(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */