Commit 21cfaa4b authored by Jan Kiene's avatar Jan Kiene
Browse files

port MR 1425 from float 

fix msan error for OSBA to stereo decoding
parent 32f8cd1f

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ 
#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif     



#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 ############################ */



#endif

lib_dec/ivas_ism_renderer_fx.c

+11 −0
Original line number Diff line number Diff line
@@ -183,6 +183,11 @@ void ivas_ism_render_sf_fx( 
    n_samples_rendered_loop = 0;

    move16();



#ifdef DEBUGGING

    assert( slots_to_render == 0 );

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

#endif



    WHILE( slots_to_render > 0 )

    {

        slots_to_render = sub( slots_to_render, st_ivas->hTcBuffer->subframe_nbslots[last_sf] );
@@ -322,7 +327,13 @@ void ivas_ism_render_sf_fx( 
        ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_in_subframe );



        n_samples_rendered_loop = add( 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 ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV_ROOM ) )

#else

        IF( EQ_16( st_ivas->renderer_type, RENDERER_TD_PANNING ) )

#endif

        {

            st_ivas->hTcBuffer->subframes_rendered = add( st_ivas->hTcBuffer->subframes_rendered, 1 );

            st_ivas->hTcBuffer->slots_rendered = add( st_ivas->hTcBuffer->slots_rendered, st_ivas->hTcBuffer->subframe_nbslots[subframe_idx] );