Commit 1b43851e authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch... 

Merge branch '1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution' into 1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution-cleanup
parents 24cdbd36 d51361a4

.gitlab-ci.yml

+4 −0
Original line number Diff line number Diff line
@@ -2248,9 +2248,13 @@ coverage-test-on-main-scheduled: 
    - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec --use_ltv

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec --use_ltv

    # need to ignore non-zero exit codes as limiter is active and thus the different framesiszes will not be BE in all cases

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only || true

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only || true

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only --use_ltv || true

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only --use_ltv || true

    - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref

    - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_cut    

    - lcov -c -d obj -o coverage_stv.info # extract coverage of short test vectors here

ci/basop-pages/basop_index.html

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
    <li><a href="ivas-pytest-compare_ref-long-dec-index.html">ivas-pytest-compare_ref-long-dec</a></li>

    <li><a href="ivas-pytest-compare_ref-long-dec-lev+10-index.html">ivas-pytest-compare_ref-long-dec-lev+10</a></li>

    <li><a href="ivas-pytest-compare_ref-long-dec-lev-10-index.html">ivas-pytest-compare_ref-long-dec-lev-10</a></li>

    <li><a href="ivas-pytest-compare_ref-long-enc-index.html">ivas-pytest-compare_ref-long-enc</a></li>

    <li><a href="ivas-pytest-compare_ref-long-enc-lev+10-index.html">ivas-pytest-compare_ref-long-enc-lev+10</a></li>

    <li><a href="ivas-pytest-compare_ref-long-enc-lev-10-index.html">ivas-pytest-compare_ref-long-enc-lev-10</a></li>

  </ul>



</body>

ci/setup_pages.py

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ JOBS_BASOP_REPO = [ 
    "ivas-pytest-compare_ref-long-dec",

    "ivas-pytest-compare_ref-long-dec-lev+10",

    "ivas-pytest-compare_ref-long-dec-lev-10",

    "ivas-pytest-compare_ref-long-enc",

    "ivas-pytest-compare_ref-long-enc-lev+10",

    "ivas-pytest-compare_ref-long-enc-lev-10",    

]



JOBS_FOR_PROJECT_ID = {

lib_com/ivas_prot.h

+12 −2
Original line number Diff line number Diff line
@@ -3995,12 +3995,22 @@ void ivas_dirac_dec_output_synthesis_cov_close( 
);



void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot(

#ifdef FIX_835_PARAMMC_BUFFER_VALUES

    float *RealBuffer,                                                          /* i  : input channel filter bank samples (real part)         */

    float *ImagBuffer,                                                          /* i  : input channel filter bank samples (imaginary part     */

    float cx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS],      /* o  : accumulated input covariance (real part)              */

    float cx_imag[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o  : accumulated input covariance (imaginary part)         */

    const int16_t param_band,                                                   /* i  : parameter band                                        */

    PARAM_MC_DEC_HANDLE hParamMC,                                               /* i  : handle to Parametric MC state                         */

    const int16_t nchan_in                                                      /* i  : number of input channels                              */

#else

    float *RealBuffer,                                                                                        /* i  : input channel filter bank samples (real part)         */

    float *ImagBuffer,                                                                                        /* i  : input channel filter bank samples (imaginary part)    */

    float cx[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS],      /* o  : accumulated input covariance (real part)              */

    float cx_imag[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o  : accumulated input covariance (imaginary part)         */

    PARAM_MC_DEC_HANDLE hParamMC,                                                                             /* i  : handle to Parametric MC state                         */

    const int16_t nchan_in                                                                                    /* i  : number of input channels                              */

#endif

);



void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot(

lib_com/options.h

+2 −3
Original line number Diff line number Diff line
@@ -173,10 +173,10 @@ 
/*#define FIX_1123_PARAMBIN_16BIT_ROM*/                 /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */

#define FIX_RETURN                                      /* VA: fix location of function returns */

#endif

#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define FIX_1135_EXT_RENDERER_HANDLES                   /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */

#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */

#define FIX_1159_SPLIT_RENDERING_CONFIG                 /* VA: issue 1159: Execute split rendering config only for split rendering outputs. */

#define FIX_1166_TDREND_DIV0                            /* FhG,Eri: issue 1166: potential divide by zero in TD Renderer */

#define FIX_835_PARAMMC_BUFFER_VALUES                   /* FhG: BASOP issue 835: wide range of buffer values for cx in ParamMC */



/* #################### End BE switches ################################## */
@@ -185,7 +185,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1141_OSBA_ROOM_RENDERING                    /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */

#define NONBE_FIX_1143_MASA_BRSW                              /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */





#define NONE_BE_FIX_816_LFE_PLC_FLOAT                   /* DLB: issue 816: reduce required precision to float for LFE-PLC*/