Commit 61a780ec authored by bayers's avatar bayers
Browse files

Merge branch '1021-msan-use-of-uninitialized-value-in-ism4-rate-switching-with-jbm' into 'main' 

[Non-BE] Resolve "MSAN: use-of-uninitialized-value in ISM4 rate switching with JBM"

See merge request !1433
parents 439f4ec3 4b8d2689

lib_com/ivas_prot.h

+3 −0
Original line number Diff line number Diff line
@@ -5218,6 +5218,9 @@ void ivas_ism_renderer_close( 


void ivas_ism_render_sf(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

    const RENDERER_TYPE renderer_type,                          /* i  : active renderer type                            */

#endif

    float *output_f[],                                          /* i/o: core-coder transport channels/object output     */

    const int16_t n_samples_to_render                           /* i  : output frame length per channel                 */

);

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH                      /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/



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

lib_dec/ivas_ism_renderer.c

+12 −2
Original line number Diff line number Diff line
@@ -141,6 +141,9 @@ void ivas_ism_renderer_close( 


void ivas_ism_render_sf(

    Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure                      */

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

    const RENDERER_TYPE renderer_type, /* i  : active renderer type                        */

#endif

    float *output_f[],                /* i/o: core-coder transport channels/object output */

    const int16_t n_samples_to_render /* i  : output frame length per channel             */

)
@@ -172,12 +175,15 @@ void ivas_ism_render_sf( 
    assert( slots_to_render == 0 );

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

#endif



#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

    num_objects = st_ivas->nchan_ism;

#else

    num_objects = st_ivas->nchan_transport;

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

    {

        num_objects = st_ivas->nchan_ism;

    }

#endif



    nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;
@@ -282,7 +288,11 @@ void ivas_ism_render_sf( 
        n_samples_rendered_loop += n_samples_in_subframe;

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

           then happen in the crend call*/

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

        if ( renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM )

#else

        if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM )

#endif

        {

            st_ivas->hTcBuffer->subframes_rendered += 1;

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

lib_dec/ivas_jbm_dec.c

+12 −0
Original line number Diff line number Diff line
@@ -1093,7 +1093,11 @@ ivas_error ivas_jbm_dec_render( 
            if ( st_ivas->renderer_type == RENDERER_TD_PANNING || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )

            {

                /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

                ivas_ism_render_sf( st_ivas, st_ivas->renderer_type, p_output, *nSamplesRendered );

#else

                ivas_ism_render_sf( st_ivas, p_output, *nSamplesRendered );

#endif

            }

            else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )

            {
@@ -1231,7 +1235,11 @@ ivas_error ivas_jbm_dec_render( 
                }



                /* render objects */

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

                ivas_ism_render_sf( st_ivas, st_ivas->renderer_type, p_output, *nSamplesRendered );

#else

                ivas_ism_render_sf( st_ivas, p_output, *nSamplesRendered );

#endif



                /* add already rendered SBA part */

                for ( n = 0; n < nchan_out; n++ )
@@ -1628,7 +1636,11 @@ ivas_error ivas_jbm_dec_flush_renderer( 
                    /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */

                    set_f( st_ivas->hIsmRendererData->interpolator, 1.0f, hTcBuffer->n_samples_granularity );



#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

                    ivas_ism_render_sf( st_ivas, renderer_type_old, p_output, hTcBuffer->n_samples_granularity );

#else

                    ivas_ism_render_sf( st_ivas, p_output, hTcBuffer->n_samples_granularity );

#endif



#if defined SPLIT_REND_WITH_HEAD_ROT

                    if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, IVAS_AUDIO_CONFIG_7_1_4, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR, st_ivas->hDecoderConfig, NULL,

lib_dec/ivas_osba_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -284,7 +284,11 @@ ivas_error ivas_osba_render_sf( 


    if ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM )

    {

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

        ivas_ism_render_sf( st_ivas, st_ivas->renderer_type, p_output_ism, *nSamplesRendered );

#else

        ivas_ism_render_sf( st_ivas, p_output_ism, *nSamplesRendered );

#endif

    }



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