Commit ea250bf9 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix merge conflict and sba output buffer setup

parent 27225462

lib_dec/ivas_osba_dec.c

+9 −2
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ ivas_error ivas_osba_dirac_td_binaural_jbm( 


    channel_offset = st_ivas->nchan_ism;



    ivas_sba_dec_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailable, output_f );



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

    {
@@ -175,6 +174,9 @@ ivas_error ivas_osba_dirac_td_binaural_jbm( 
        }

    }



	ivas_sba_dec_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailable, output_f );





    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

    {

        if ( ( error = ivas_sba_upmixer_renderer( st_ivas, &output_f[channel_offset], nSamplesAsked ) ) != IVAS_ERR_OK )
@@ -184,7 +186,12 @@ ivas_error ivas_osba_dirac_td_binaural_jbm( 
    }

    else

    {

        ivas_dirac_dec_binaural( st_ivas, st_ivas->hCombinedOrientationData, &output_f[channel_offset], st_ivas->nchan_transport );

        ivas_dirac_dec_binaural( st_ivas, st_ivas->hCombinedOrientationData, &output_f[channel_offset], st_ivas->nchan_transport

#ifdef API_5MS

                                 ,

                                 MAX_PARAM_SPATIAL_SUBFRAMES

#endif

        );

    }



    if ( ( error = ivas_td_binaural_renderer( st_ivas, p_sepobj, nSamplesAsked ) ) != IVAS_ERR_OK )