Commit 3089a7e5 authored by sagnowski's avatar sagnowski
Browse files

Merge branch '1343-split-rendering-in-voip-mode-support-for-mixed-formats' into 'main' 

Resolve "Split rendering in VoIP mode - support for mixed formats"

See merge request !2259
parents 85d3441d 3a7f89a0

lib_dec/ivas_omasa_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -799,7 +799,6 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm( 
            {

                cldfbAnalysis_ts( &( p_rend_obj[n][num_cldfb_bands * slot_idx] ), Cldfb_RealBuffer, Cldfb_ImagBuffer, num_cldfb_bands, st_ivas->hSplitBinRend->splitrend.hCldfbHandles->cldfbAna[n] );



                /* note: this intentionally differs from OSBA by: no scaling by 0.5 */

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

                ivas_CLDFB_RINGBUF_GetByIdx( st_ivas->hSplitBinRend->hMultiBinCldfbData[n], &re, &im, slot_idx - cldfb_slots );

                v_add( re, Cldfb_RealBuffer, re, num_cldfb_bands );

tests/split_rendering/test_split_rendering.py

+4 −4
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ def test_masa_external_split( 
""" OMASA """





# @pytest.mark.parametrize("delay_profile", DELAY_PROFILES) # Waiting for issue #1343 to be resolved

@pytest.mark.parametrize("delay_profile", DELAY_PROFILES)

@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)

@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_OMASA)

@pytest.mark.parametrize("bitrate", IVAS_BITRATES_OMASA)
@@ -375,7 +375,7 @@ def test_omasa_full_chain_split( 
    bitrate,

    render_config,

    trajectory,

    delay_profile=None,

    delay_profile,

):

    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -437,7 +437,7 @@ def test_omasa_external_split( 
""" OSBA """





# @pytest.mark.parametrize("delay_profile", DELAY_PROFILES) # Waiting for issue #1343 to be resolved

@pytest.mark.parametrize("delay_profile", DELAY_PROFILES)

@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)

@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_OSBA)

@pytest.mark.parametrize("bitrate", IVAS_BITRATES_OSBA)
@@ -455,7 +455,7 @@ def test_osba_full_chain_split( 
    bitrate,

    render_config,

    trajectory,

    delay_profile=None,

    delay_profile,

):

    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")

tests/split_rendering/test_voip_be_splitrend_vs_binaural.py

+0 −3
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ IN_FORMATS = [ 
    "ISM4",

    "FOA",

    "MASA2TC",

    # Mixed formats to be finalised in a follow-up issue #1343

    # "OSBA_ISM3_HOA3",

    # "OMASA_ISM4",

]



DELAY_PROFILES = ["dly_error_profile_0.dat", "dly_error_profile_5.dat"]