Commit a005cbb0 authored by norvell's avatar norvell
Browse files

Merge branch 'ci/update-basop-ci-branch' into 'basop-ci-branch' 

Update basop-ci-branch with SBA LTV tests

See merge request !1758
parents c689611d 6446dc93

.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

lib_com/ivas_rom_com.c

+0 −10
Original line number Diff line number Diff line
@@ -1876,16 +1876,6 @@ const float ivas_param_mc_dmx_fac_CICP19_3tc[36] = 
    0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f /*Ct*/

};













#ifndef FIX_1157_OBSOLETE_DMX_TABLE













const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =













{













    1.0f, 0.0f, INV_SQRT2, INV_SQRT2, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, /*Lht*/













    0.0f, 1.0f, INV_SQRT2, INV_SQRT2, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, /*Rht*/













    0.0f, 0.0f, 0.0f,      0.0f,      0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, /*Lut*/













    0.0f, 0.0f, 0.0f,      0.0f,      0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, /*Rut*/













};













#endif



























/* Coefficient for Parametric MC ILD factorization */















const float ivas_param_mc_ild_fac_CICP6_2tc[6] =















{

































lib_com/options.h



+0
−6




























Original line number
Diff line number
Diff line








@@ -173,11 +173,7 @@













/*#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_1152_UNINIT_VAL_IN_ITD_VAD_COMPUTATION      /* FhG: fix uninitialized value being used in ITD VAD mid signal computation that does not affect synthesis, but crashes BASOPs */













#define FIX_1157_OBSOLETE_DMX_TABLE                     /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */















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













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































/* #################### End BE switches ################################## */

























@@ -186,8 +182,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_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */













#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*/

































lib_dec/ivas_dirac_dec.c



+26
−8




























Original line number
Diff line number
Diff line








@@ -2224,11 +2224,16 @@ void ivas_dirac_dec_render_sf(













        /* render objects in combined format onto the CICP19 channels for BINAURAL_ROOM_IR */















        if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )















        {













#ifndef NONBE_FIX_1141_OSBA_ROOM_RENDERING















            int16_t in_ch;















            for ( in_ch = 0; in_ch < st_ivas->nchan_ism; in_ch++ )















            {













                int16_t j, k, j2, l;













                int16_t num_objects, nchan_out_woLFE, lfe_index;













#endif













                int16_t j, k, l;













#ifndef NONBE_FIX_1141_OSBA_ROOM_RENDERING













                int16_t j2, lfe_index;













#endif













                int16_t num_objects, nchan_out_woLFE;















                int16_t az1, el1;















                int16_t n_slots_to_render;















                int16_t n_samples_to_render;










@@ -2267,13 +2272,19 @@ void ivas_dirac_dec_render_sf(













                        }















                    }





























#ifdef NONBE_FIX_1141_OSBA_ROOM_RENDERING













                    for ( j = 0; j < nchan_out_woLFE; j++ )













#else















                lfe_index = 0;















                for ( j = 0, j2 = 0; j < nchan_out_woLFE; j++, j2++ )













#endif















                    {













#ifndef NONBE_FIX_1141_OSBA_ROOM_RENDERING















                        if ( ( st_ivas->hIntSetup.num_lfe > 0 ) && ( st_ivas->hIntSetup.index_lfe[lfe_index] == j ) )















                        {















                            ( lfe_index < ( st_ivas->hIntSetup.num_lfe - 1 ) ) ? ( lfe_index++, j2++ ) : j2++;















                        }













#endif































                        gain = st_ivas->hIsmRendererData->gains[i][j];















                        prev_gain = st_ivas->hIsmRendererData->prev_gains[i][j];









@@ -2300,8 +2311,13 @@ void ivas_dirac_dec_render_sf(





























                                for ( l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )















                                {













#ifdef NONBE_FIX_1141_OSBA_ROOM_RENDERING













                                    Cldfb_RealBuffer[j][k][l] += g * *( tc_re++ );













                                    Cldfb_ImagBuffer[j][k][l] += g * *( tc_im++ );













#else















                                Cldfb_RealBuffer[j2][k][l] += g * *( tc_re++ );















                                Cldfb_ImagBuffer[j2][k][l] += g * *( tc_im++ );













#endif















                                }















                                w1 += hSpatParamRendCom->num_freq_bands;















                            }









@@ -2314,7 +2330,9 @@ void ivas_dirac_dec_render_sf(













                        }















                    }















                }













#ifndef NONBE_FIX_1141_OSBA_ROOM_RENDERING















            }













#endif















#ifdef NONBE_FIX_1141_OSBA_ROOM_RENDERING















            st_ivas->hIsmRendererData->interp_offset += hSpatParamRendCom->num_freq_bands * st_ivas->hSpar->subframe_nbslots[st_ivas->hSpar->subframes_rendered];















#endif

































lib_dec/ivas_masa_dec.c



+0
−5




























Original line number
Diff line number
Diff line








@@ -1393,14 +1393,9 @@ ivas_error ivas_masa_dec_reconfigure(













        sts = st_ivas->hCPE[cpe_id]->hCoreCoder;















        sts[0]->bit_stream = bit_stream + num_bits;















        num_bits += (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC );













#ifdef NONBE_FIX_1143_MASA_BRSW















        if ( ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate >= MASA_STEREO_MIN_BITRATE ) ||















             ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == FRAME_NO_DATA ) ||















             ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == IVAS_SID_5k2 ) )













#else













        if ( ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate >= MASA_STEREO_MIN_BITRATE ) ||













             ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == FRAME_NO_DATA ) )













#endif















        {















            st_ivas->hCPE[cpe_id]->nchan_out = 1;















            if ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirACRend != NULL ) || ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) && st_ivas->hDiracDecBin[0] != NULL ) )