Commit 23ea487d authored by bayers's avatar bayers
Browse files

fix for #999, fix MCT renderer flushing on JBM rate switch

parent 472d3527

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 
#endif



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

#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
@@ -1692,7 +1692,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 )

                    {
@@ -1701,6 +1705,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

            {