Commit bcdf9117 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1620_ref_msan_error_osba_to_stereo' into 'float-pc' 

port MR 1425 into float-pc

See merge request !1756
parents 07d9377a 966e97cf

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ 
#define FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */

#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER            /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */

#define FIX_998_UNUSED_FUNCTION                         /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */ 

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO              /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_ism_renderer.c

+11 −0
Original line number Diff line number Diff line
@@ -169,6 +169,11 @@ void ivas_ism_render_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 +281,13 @@ 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_1015_1016_OSBA_JBM_STEREO

        /* update rendered subframe and slots info for all cases apart from a following crend call, the update will

           then happen in the crend call*/

        if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM )

#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];