Commit 8b75e559 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_999_JBM_MCT_FLUSH

parent 8c97d14d

lib_com/options.h

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


//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */



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

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

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS            /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF   */           /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

lib_dec/ivas_jbm_dec_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -2843,11 +2843,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 


                    ivas_binaural_add_LFE_fx( st_ivas, hTcBuffer->n_samples_granularity, st_ivas->hTcBuffer->tc_fx, p_output_fx );

                }

#ifdef NONBE_FIX_999_JBM_MCT_FLUSH

                ELSE IF( EQ_16( renderer_type_old, RENDERER_BINAURAL_OBJECTS_TD ) )

#else

                ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) )

#endif

                {

                    IF( NE_32( ( error = ivas_td_binaural_renderer_sf_fx( st_ivas, p_output_fx, hTcBuffer->n_samples_granularity ) ), IVAS_ERR_OK ) )

                    {
@@ -2855,12 +2851,10 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
                    }

                    ivas_binaural_add_LFE_fx( st_ivas, *nSamplesRendered, st_ivas->hTcBuffer->tc_fx, p_output_fx );

                }

#ifdef NONBE_FIX_999_JBM_MCT_FLUSH

                ELSE

                {

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

                }

#endif

            }

            ELSE

            {