Commit bb1f29a7 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_999_JBM_MCT_FLUSH

parent aed5ed56

lib_com/options.h

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

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



#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF                    /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */

lib_dec/ivas_jbm_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -1682,11 +1682,7 @@ 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 )

                    {
@@ -1695,12 +1691,10 @@ 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

            {