Commit 5202e0e3 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 63-deadlock-in-ivasmoderunner-py

parents 006d2d0b 541af14e

.gitlab-ci.yml

+3 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ self-test-on-merge-request: 
    - exit_code=0

    - python3 ./scripts/ivas_pytests/self_test_b.py --encref IVAS_cod_ref --decref IVAS_dec_ref --encdut IVAS_cod_test --decdut IVAS_dec_test || exit_code=$?

    - if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "pytest run had failures and non-BE flag not present"; exit $EXIT_CODE_FAIL; fi

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

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

    - if [ $exit_code -eq 1 ] && [ $zero_errors == 1 ]; then echo "pytest run had failures, but no errors and non-BE flag present"; exit $EXIT_CODE_NON_BE; fi

    - if [ $exit_code -ne 0 ]; then echo "pytest run had errors"; exit $EXIT_CODE_FAIL; fi;

    # return exit code from selftest if everything went well with the pytest run
@@ -219,10 +219,12 @@ self-test-on-merge-request: 
    exit_codes:

      - 123

  artifacts:

    when: always

    paths:

      - test_output.txt

      - scripts/test/logs

      - scripts/ref/logs

      - report-junit.xml

    reports:

      junit: report-junit.xml

lib_com/options.h

+2 −4
Original line number Diff line number Diff line
@@ -148,15 +148,13 @@ 
/*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/            /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/





#define SIMPLIFY_SBA_RENDERING_LOGIC                    /* SBA rendering maintenance related to ticket #45 */

#define SBA_CLEANING                                    /* SBA maintenance related to ticket #45 */ 









#define REFACTOR_REVERB_INIT_ADD_CFG_CHECKS             /* Simplify and improve reverb initialization + add range checks on config parameter values */ 



#define DIRAC_DRCT_GAIN_TUNING



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_dec/ivas_dirac_output_synthesis_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -729,8 +729,13 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( 
            g1 = 0.3679f + onset_filter[l] * ( 0.1175f - 0.3679f );

            g2 = ( 1.f - g1 ) * *( p_gains_dir );

            g2 += g1 * ( *( p_cy_cross_dir_smooth++ ) );

#ifdef DIRAC_DRCT_GAIN_TUNING

            g2 = max( g2, 0.85f );

            g2 = min( g2, 1.15f );

#else

            g2 = max( g2, 0.5f );

            g2 = min( g2, 2.f );

#endif

            *( p_gains_dir++ ) = g2;

        }

    }