diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index ba35d95042fb8e59cde0218700833da7d720aa59..81efc7d9892c1a0e330fbe9caaacee699bcc1094 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -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" ); diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py index 67c6f0cd121e405626fd5af41ccad62398ba536e..57a54f6d4e92de89da98221a43965f3d4586e619 100644 --- a/tests/renderer/test_renderer.py +++ b/tests/renderer/test_renderer.py @@ -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"),