Commit f6701ea3 authored by multrus's avatar multrus
Browse files

[cleanup] accept REMOVE_CAM_FROM_IVAS

parent 8760d00c

lib_com/options.h

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

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */

#define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */

#define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */

lib_enc/ivas_core_enc.c

+0 −7
Original line number Diff line number Diff line
@@ -418,13 +418,6 @@ ivas_error ivas_core_enc( 
            stereo_icBWE_enc( hCPE, shb_speech, new_swb_speech_buffer, voice_factors[0] );

        }



#ifndef REMOVE_CAM_FROM_IVAS

        /*---------------------------------------------------------------------*

         * Channel-aware mode - write signaling information into the bitstream

         *---------------------------------------------------------------------*/



        signaling_enc_rf( st );

#endif

        /*---------------------------------------------------------------------*

         * Common updates

         *---------------------------------------------------------------------*/