Commit 60f92276 authored by sagnowski's avatar sagnowski
Browse files

Remove unneeded occurrences of BASOP_SATURATE_ERROR_(ON|OFF)

parent ac773b52

lib_dec/decoder.c

+0 −10
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ int main(int argc, char *argv[]) 
    {

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

        BASOP_SATURATE_WARNING_OFF

        BASOP_SATURATE_ERROR_OFF

#endif

#ifdef SUPPORT_JBM_TRACEFILE

        IF( decodeVoip(st_fx, f_stream, f_synth, jbmTraceFileName, jbmFECoffsetFileName, quietMode ) != 0 )
@@ -91,7 +90,6 @@ int main(int argc, char *argv[]) 
#endif

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

        BASOP_SATURATE_WARNING_ON

        BASOP_SATURATE_ERROR_ON

#endif

        {

            free( st_fx );
@@ -169,24 +167,20 @@ int main(int argc, char *argv[]) 
                {

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

                    BASOP_SATURATE_WARNING_OFF

                    BASOP_SATURATE_ERROR_OFF

#endif

                    amr_wb_dec_fx( output,st_fx);

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

                    BASOP_SATURATE_WARNING_ON

                    BASOP_SATURATE_ERROR_ON

#endif

                }

                ELSE

                {

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

                    BASOP_SATURATE_WARNING_OFF

                    BASOP_SATURATE_ERROR_OFF

#endif

                    evs_dec_fx( st_fx, output, FRAMEMODE_NORMAL);

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

                    BASOP_SATURATE_WARNING_ON

                    BASOP_SATURATE_ERROR_ON

#endif

                }

            }
@@ -196,24 +190,20 @@ int main(int argc, char *argv[]) 
                {

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

                    BASOP_SATURATE_WARNING_OFF

                    BASOP_SATURATE_ERROR_OFF

#endif

                    evs_dec_fx( st_fx, output, FRAMEMODE_NORMAL);

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

                    BASOP_SATURATE_WARNING_ON

                    BASOP_SATURATE_ERROR_ON

#endif

                }

                ELSE /* conceal */

                {

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

                    BASOP_SATURATE_WARNING_OFF

                    BASOP_SATURATE_ERROR_OFF

#endif

                    evs_dec_fx( st_fx, output, FRAMEMODE_MISSING);

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

                    BASOP_SATURATE_WARNING_ON

                    BASOP_SATURATE_ERROR_ON

#endif

                }

            }

lib_enc/encoder.c

+0 −4
Original line number Diff line number Diff line
@@ -239,12 +239,10 @@ int main( int argc, char** argv ) 
            SUB_WMOPS_INIT("amr_wb_enc");

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

            BASOP_SATURATE_WARNING_OFF

            BASOP_SATURATE_ERROR_OFF

#endif

            amr_wb_enc_fx( st_fx, data, n_samples);

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

            BASOP_SATURATE_WARNING_ON

            BASOP_SATURATE_ERROR_ON

#endif

            END_SUB_WMOPS;

        }
@@ -254,12 +252,10 @@ int main( int argc, char** argv ) 
            /* EVS encoder*/

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

            BASOP_SATURATE_WARNING_OFF

            BASOP_SATURATE_ERROR_OFF

#endif

            evs_enc_fx( st_fx, data, st_fx->mem_hp20_in_fx, n_samples);

#ifdef BASOP_IGNORE_WARNINGS_AND_ERRORS_IN_EVS

            BASOP_SATURATE_WARNING_ON

            BASOP_SATURATE_ERROR_ON

#endif

            END_SUB_WMOPS;

        }