Commit acc98109 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO

parent 55e32cf9

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */

#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */

#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define FIX_901_PARAMMC_DEAD_CODE                       /* FhG: issue 901: remove dead ParamMC code             */

lib_dec/ivas_jbm_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -143,13 +143,6 @@ ivas_error ivas_jbm_dec_tc( 
        {

            hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

        }

#ifndef FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO



        if ( st_ivas->renderer_type == RENDERER_MC && st_ivas->hDecoderConfig->nchan_out == 1 )

        {

            ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output );

        }

#endif

    }

    else if ( st_ivas->ivas_format == ISM_FORMAT )

    {