Commit 09d781af authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch '999-jbm-flushing-of-mct-can-cause-endless-loop' into 'main' 

[Non-BE] Resolve "JBM: Flushing of MCT can cause endless loop"

See merge request !1399
parents a4062860 3814e6b4

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ 


#define NONBE_FIX_984_OMASA_EXT_OUTPUT                        /* Nokia: issue #984: complete the OMASA EXT output implementation */

#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 NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */



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

lib_dec/ivas_jbm_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -1694,7 +1694,11 @@ ivas_error ivas_jbm_dec_flush_renderer( 


                    ivas_binaural_add_LFE( st_ivas, hTcBuffer->n_samples_granularity, st_ivas->hTcBuffer->tc, p_output );

                }

#ifdef NONBE_FIX_999_JBM_MCT_FLUSH

                else if ( renderer_type_old == RENDERER_BINAURAL_OBJECTS_TD )

#else

                else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

#endif

                {

                    if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, p_output, hTcBuffer->n_samples_granularity ) ) != IVAS_ERR_OK )

                    {
@@ -1703,6 +1707,12 @@ ivas_error ivas_jbm_dec_flush_renderer( 


                    ivas_binaural_add_LFE( st_ivas, hTcBuffer->n_samples_granularity, st_ivas->hTcBuffer->tc, p_output );

                }

#ifdef NONBE_FIX_999_JBM_MCT_FLUSH

                else

                {

                    return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong renderer in MCT VoIP renderer flushing!" );

                }

#endif

            }

            else

            {