Commit 3c5b067c authored by TYAGIRIS's avatar TYAGIRIS
Browse files

fix BIN rendering with 20ms path when split rend switch is off

parent 8bef1c48

lib_rend/lib_rend.c

+2 −2
Original line number Diff line number Diff line
@@ -4850,7 +4850,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" );
@@ -9264,7 +9264,7 @@ ivas_error IVAS_REND_GetSamples( 
         ( 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_be_comparison.py

+0 −2
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,