Commit 012b2473 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

port missing changes from float MR 1433

parent 614b80da

lib_com/ivas_prot_fx.h

+6 −3
Original line number Diff line number Diff line
@@ -1056,6 +1056,9 @@ ivas_error ivas_ism_renderer_open_fx( 


void ivas_ism_render_sf_fx(

    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

    Word32 *output_fx[],                 /* i/o: core-coder transport channels/object output */

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

);

lib_dec/ivas_ism_renderer_fx.c

+10 −3
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ void ivas_ism_renderer_close( 
 *-------------------------------------------------------------------------*/

void ivas_ism_render_sf_fx(

    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

    Word32 *output_fx[],                  /* i/o: core-coder transport channels/object output  Q11*/

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

)
@@ -333,7 +336,11 @@ void ivas_ism_render_sf_fx( 
        n_samples_rendered_loop = add( 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 ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV_ROOM ) )

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

lib_dec/ivas_osba_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -308,7 +308,11 @@ ivas_error ivas_osba_render_sf_fx( 


    IF( NE_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )

    {

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

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

#else

        ivas_ism_render_sf_fx( st_ivas, p_output_ism, *nSamplesRendered );

#endif

    }



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