Commit cc1158da authored by norvell's avatar norvell
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 746-using-non-diegetic-panning-flag-in-ism-input-metadata-file-causes-crash-in-decoder
parents 09895bc8 e6a32f2b

lib_rend/lib_rend.c

+2 −2
Original line number Diff line number Diff line
@@ -4752,7 +4752,7 @@ ivas_error IVAS_REND_FeedInputAudio( 
         ( inputAudio.config.numSamplesPerChannel * 1000 / cldfb2tdSampleFact ) != ( BINAURAL_RENDERING_FRAME_SIZE_MS * hIvasRend->num_subframes ) * hIvasRend->sampleRateOut )

#else

    if ( getAudioConfigType( hIvasRend->outputConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL &&

         inputAudio.config.numSamplesPerChannel * 1000 != BINAURAL_RENDERING_FRAME_SIZE_MS * hIvasRend->sampleRateOut )

         inputAudio.config.numSamplesPerChannel * 1000 != ( BINAURAL_RENDERING_FRAME_SIZE_MS * hIvasRend->num_subframes ) * hIvasRend->sampleRateOut )

#endif

    {

        return IVAS_ERROR( IVAS_ERR_INVALID_BUFFER_SIZE, "Binaural rendering requires specific frame size" );
@@ -8707,7 +8707,7 @@ static ivas_error getSamplesInternal( 
         ( outAudio.config.numSamplesPerChannel * 1000 / cldfb2tdSampleFact ) != ( hIvasRend->num_subframes * BINAURAL_RENDERING_FRAME_SIZE_MS ) * hIvasRend->sampleRateOut )

#else

    if ( getAudioConfigType( hIvasRend->outputConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL &&

         outAudio.config.numSamplesPerChannel * 1000 != BINAURAL_RENDERING_FRAME_SIZE_MS * hIvasRend->sampleRateOut )

         outAudio.config.numSamplesPerChannel * 1000 != ( hIvasRend->num_subframes * BINAURAL_RENDERING_FRAME_SIZE_MS ) * hIvasRend->sampleRateOut )

#endif

    {

        return IVAS_ERROR( IVAS_ERR_INVALID_BUFFER_SIZE, "Binaural rendering requires specific frame size" );

tests/renderer/test_renderer.py

+0 −16
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ def test_ambisonics(test_info, in_fmt, out_fmt, framing_5ms): 
@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_ambisonics_binaural_static(test_info, in_fmt, out_fmt, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    run_renderer(

        in_fmt,
@@ -71,8 +69,6 @@ def test_ambisonics_binaural_static(test_info, in_fmt, out_fmt, framing_5ms): 
def test_ambisonics_binaural_headrotation(

    test_info, in_fmt, out_fmt, trj_file, framing_5ms

):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    run_renderer(

        in_fmt,
@@ -307,8 +303,6 @@ def test_multichannel(test_info, in_fmt, out_fmt, framing_5ms): 
def test_multichannel_binaural_static(test_info, in_fmt, out_fmt, framing_5ms):

    if in_fmt in ["MONO", "STEREO"]:

        pytest.skip("MONO or STEREO to Binaural rendering unsupported")

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    run_renderer(

        in_fmt,
@@ -327,8 +321,6 @@ def test_multichannel_binaural_headrotation( 
):

    if in_fmt in ["MONO", "STEREO"]:

        pytest.skip("MONO or STEREO to Binaural rendering unsupported")

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    if (in_fmt == "5_1" or in_fmt == "7_1") and out_fmt == "BINAURAL":

        run_renderer(
@@ -399,8 +391,6 @@ def test_ism(test_info, in_fmt, out_fmt, framing_5ms): 
@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_ism_binaural_static(test_info, in_fmt, out_fmt, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    try:

        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]
@@ -421,8 +411,6 @@ def test_ism_binaural_static(test_info, in_fmt, out_fmt, framing_5ms): 
@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    try:

        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]
@@ -529,8 +517,6 @@ def test_custom_ls_input_output(test_info, in_fmt, out_fmt): 
@pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_custom_ls_input_binaural(test_info, in_layout, out_fmt, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    run_renderer(

        CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),
@@ -547,8 +533,6 @@ def test_custom_ls_input_binaural(test_info, in_layout, out_fmt, framing_5ms): 
def test_custom_ls_input_binaural_headrotation(

    test_info, in_layout, out_fmt, trj_file, framing_5ms

):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    run_renderer(

        CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),

tests/renderer/test_renderer_be_comparison.py

+0 −20
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ def test_ambisonics(test_info, in_fmt, out_fmt): 
@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_ambisonics_binaural_static(test_info, in_fmt, out_fmt, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")

    compare_renderer_vs_mergetarget(

        test_info,

        in_fmt,
@@ -65,8 +63,6 @@ def test_ambisonics_binaural_static(test_info, in_fmt, out_fmt, framing_5ms): 
def test_ambisonics_binaural_headrotation(

    test_info, in_fmt, out_fmt, trj_file, framing_5ms

):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")

    compare_renderer_vs_mergetarget(

        test_info,

        in_fmt,
@@ -92,8 +88,6 @@ def test_multichannel(test_info, in_fmt, out_fmt): 
def test_multichannel_binaural_static(test_info, in_fmt, out_fmt, framing_5ms):

    if in_fmt in ["MONO", "STEREO"]:

        pytest.skip("MONO or STEREO to Binaural rendering unsupported")

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    compare_renderer_vs_mergetarget(

        test_info,
@@ -113,8 +107,6 @@ def test_multichannel_binaural_headrotation( 
):

    if in_fmt in ["MONO", "STEREO"]:

        pytest.skip("MONO or STEREO to Binaural rendering unsupported")

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    compare_renderer_vs_mergetarget(

        test_info,
@@ -141,8 +133,6 @@ def test_ism(test_info, in_fmt, out_fmt): 
@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_ism_binaural_static(test_info, in_fmt, out_fmt, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    try:

        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]
@@ -164,8 +154,6 @@ def test_ism_binaural_static(test_info, in_fmt, out_fmt, framing_5ms): 
@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")



    try:

        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]
@@ -198,8 +186,6 @@ def test_masa(test_info, in_fmt, out_fmt): 
@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_masa_binaural_static(test_info, in_fmt, out_fmt, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")

    if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]:

        pytest.skip("Skipping binaural room outputs for MASA as unimplemented.")
@@ -217,8 +203,6 @@ def test_masa_binaural_static(test_info, in_fmt, out_fmt, framing_5ms): 
@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_masa_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")

    if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]:

        pytest.skip("Skipping binaural room outputs for MASA as unimplemented.")
@@ -272,8 +256,6 @@ def test_custom_ls_input_output(test_info, in_fmt, out_fmt): 
@pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST)

@pytest.mark.parametrize("framing_5ms", FRAMING_5MS_TO_TEST)

def test_custom_ls_input_binaural(test_info, in_layout, out_fmt, framing_5ms):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")

    compare_renderer_vs_mergetarget(

        test_info,

        CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),
@@ -290,8 +272,6 @@ def test_custom_ls_input_binaural(test_info, in_layout, out_fmt, framing_5ms): 
def test_custom_ls_input_binaural_headrotation(

    test_info, in_layout, out_fmt, trj_file, framing_5ms

):

    if framing_5ms != "5ms":

        pytest.xfail("Binaural output currently only supported with 5ms framing")

    compare_renderer_vs_mergetarget(

        test_info,

        CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),