Commit 88e2b579 authored by Jan Kiene's avatar Jan Kiene
Browse files

port MR 1425 from float 

fix a msan error in OSBA to stereo decoding
parent 82add814

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ 
#define NONBE_FIX_1000_G1_G2_SWB_TBE                    /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

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