Commit 4586a1a3 authored by bayers's avatar bayers
Browse files

fix for #1014, fix OSBA discrete object stereo output, update TC buffer... 

fix for #1014, fix OSBA discrete object stereo output, update TC buffer subframe information in the ISM rendering for the discrete objects
parent baf63d2f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF                    /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */

#define NONBE_FIX_1014_OSBA_JBM_STEREO                        /* FhG: issue #1014: fix stereo output for OSBA*/

/* ##################### End NON-BE switches ########################### */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_ism_renderer.c

+8 −1
Original line number Diff line number Diff line
@@ -168,7 +168,10 @@ void ivas_ism_render_sf( 
        slots_to_render -= st_ivas->hTcBuffer->subframe_nbslots[last_sf];

        last_sf++;

    }



#ifdef DEBUGGING

    assert( slots_to_render == 0 );

    assert( last_sf <= st_ivas->hTcBuffer->nb_subframes );

#endif

    num_objects = st_ivas->nchan_transport;

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

    {
@@ -276,7 +279,11 @@ void ivas_ism_render_sf( 
        ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_in_subframe );



        n_samples_rendered_loop += n_samples_in_subframe;

#ifdef NONBE_FIX_1014_OSBA_JBM_STEREO

        if ( st_ivas->renderer_type == RENDERER_TD_PANNING || st_ivas->renderer_type == RENDERER_OSBA_STEREO )

#else

        if ( st_ivas->renderer_type == RENDERER_TD_PANNING )

#endif

        {

            st_ivas->hTcBuffer->subframes_rendered += 1;

            st_ivas->hTcBuffer->slots_rendered += st_ivas->hTcBuffer->subframe_nbslots[subframe_idx];