Commit 4191f3ec authored by malenov's avatar malenov
Browse files

avoid including debug.h in options.h

parent 39ce4686

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 


/*#define DEBUGGING*/                             /* Allows debugging message to be printed out during runtime */

#ifdef DEBUGGING

#include "debug.h"

/*#define DBG_WAV_WRITER*/

#endif



#define SUPPORT_JBM_TRACEFILE                   /* Support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */
@@ -113,7 +113,6 @@ 
#define FIX_TMP_714

#define BASOP_NOGLOB_TMP_715

#define EVS_FUNC_MODIFIED

//#define DBG_WAV_WRITER

#define EVS_FLOAT_ENC

#define FIX_667_DISABLE_INITIAL_PLC_SUPPRESSION

#define IVAS_CNST

lib_debug/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -919,6 +919,7 @@ int16_t dbgwrite_wav( 


    return 0;

}

#endif





int16_t dbgwrite_txt(
@@ -974,5 +975,4 @@ int16_t dbgwrite_txt( 


    return 0;

}

#endif

#endif /* DEBUGGING */

lib_debug/debug.h

+3 −1
Original line number Diff line number Diff line
@@ -105,12 +105,14 @@ int16_t dbgwrite_wav( 
    const char *const filename,

    int32_t fs,

    int16_t num_chs );

#endif



int16_t dbgwrite_txt(

    const float *buffer, /* i  : Write buffer */

    const int16_t count, /* i  : Number of elements */

    const char *const filename,

    const char *const msg_opt );

#endif



void dbgwrite_mat_repeat(

    float *buffer,      /* i  : write buffer */

    int16_t nRow,       /* i  : matrix size (rows) */

lib_dec/ivas_sba_rendering_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ void ivas_sba_mix_matrix_determiner_fx( 
    ivas_agc_dec_process_fx( hSpar->hAgcDec, ( output_fx ), ( output_fx ), nchan_transport, output_frame );

    Q_p_output = sub( Q_p_output, 3 );

#ifdef DEBUGGING

    dbgwrite_txt( &output[0][0], output_frame, "fix_ivas_agc_dec_process_output.txt", NULL );

    dbgwrite_txt( (const float *)(output_fx[0]), output_frame, "fix_ivas_agc_dec_process_output.txt", NULL );

#endif 



    /* Convert numeric range back */

lib_dec/ivas_stereo_dft_dec_fx.c

+9 −2
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ 
#ifdef IVAS_FLOAT_FIXED

#include "ivas_prot_fx.h"

#include "basop_util.h"

#endif

#ifdef DEBUGGING

#include "debug.h"

#endif





#ifdef IVAS_FLOAT_FIXED



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

 * Local constants
@@ -3927,7 +3934,7 @@ void stereo_dft_dec_read_BS_fx( 


            hStereoDft->res_global_gain_fx = ECSQ_dequantize_gain_fx( I );

#ifdef DEBUGGING

            dbgwrite_txt( &hStereoDft->res_global_gain, 1, "fixed_res_global_gain.txt", NULL );

            dbgwrite_txt( (const float *)(&hStereoDft->res_global_gain_fx), 1, "fixed_res_global_gain.txt", NULL );

#endif 



            ecsq_inst.config_index = sub( shl( hStereoDft->res_cod_mode[k_offset], 1 ), 1 );
@@ -3947,7 +3954,7 @@ void stereo_dft_dec_read_BS_fx( 
            ECSQ_dequantize_vector_fx( dec, hStereoDft->res_global_gain_fx, hStereoDft->res_cod_line_max, res_buf_fx );



#ifdef DEBUGGING

            dbgwrite_txt( res_buf, hStereoDft->res_cod_line_max, "fixed_res_buf.txt", NULL );

            dbgwrite_txt( (const float *) res_buf_fx, hStereoDft->res_cod_line_max, "fixed_res_buf.txt", NULL );

#endif 

        }

        ELSE