Commit 553699bb authored by vaclav's avatar vaclav
Browse files

- fix compilation warnings within SPAR_HOA_DBG and DEBUG_SBA_MD_DUMP 

- define 'extern WAVEFILEOUT *spar_foa_dec_wav[4]' in sba_debug.h
parent ce3764e5

lib_com/ivas_spar_com.c

+8 −6
Original line number Diff line number Diff line
@@ -1551,9 +1551,9 @@ void ivas_compute_spar_params( 
{

    float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS];

    int16_t b, i, ndm;

    ivas_get_pred_coeffs( pppCov_mat_re, pred_coeffs_re, dm_fv_re, num_ch,

                          start_band, end_band, active_w, dtx_vad,

                          from_dirac );



    ivas_get_pred_coeffs( pppCov_mat_re, pred_coeffs_re, dm_fv_re, num_ch, start_band, end_band, active_w, dtx_vad, from_dirac );



#ifdef SPAR_HOA_DBG

    /*fprintf(stderr, "\n\n Prediction Coefficients:\n");
@@ -1613,15 +1613,17 @@ void ivas_compute_spar_params( 
            {

                fprintf( stdout, "\n\nUnquantised C, P coeffs -- band %d:\n", b );



                for ( ii = 0; ii < num_ch; ii++ )

                for ( int16_t ii = 0; ii < num_ch; ii++ )

                {

                    fprintf( stdout, "%f |", hSparMd->band_coeffs[b].pred_re[ii] );



                    if ( ii < num_ch - ndm )

                    {

                        for ( jj = 0; jj < ndm - 1; jj++ )

                        for ( int16_t jj = 0; jj < ndm - 1; jj++ )

                        {

                            fprintf( stdout, "%f,\t", hSparMd->band_coeffs[b].C_re[ii][jj] );

                        fprintf( stdout, "| %f", hSparMd->band_coeffs[b].P_re[ii][ii] );

                        }

                        fprintf( stdout, "| %f", hSparMd->band_coeffs[b].P_re[ii] );

                    }

                    fprintf( stdout, "\n" );

                }

lib_com/options.h

+4 −4
Original line number Diff line number Diff line
@@ -114,17 +114,17 @@ 
/*#define TDREND_HRTF_TABLE_METHODS*/           /* Enable HRTF lookup from tables, for testing & evaluation. Supply file in table format to use. Note that a suitable HR filter lookup method should be written if the filters sample point grids are not in the formats. */

/*#define TDREND_STANDALONE*/                   /* Used when renderer is built in standalone form, without IVAS encoding/decoding (see scripts/object_renderer_standalone). This is just here to ensure this is cleaned out by prepare_instrumentation.sh */



/*#define DEBUG_SBA*/                           /* debug DIRAC/SPAR in-out */

#define DEBUG_SBA                           /* debug DIRAC/SPAR in-out */

#ifdef DEBUG_SBA

/*#define DEBUG_SBA_AUDIO_DUMP*/                /* SBA intermediate audio wav file dumping */

/*#define DEBUG_SBA_MD_DUMP*/                   /* SBA metadata and variable file dumping */

#define DEBUG_SBA_AUDIO_DUMP                /* SBA intermediate audio wav file dumping */

#define DEBUG_SBA_MD_DUMP                   /* SBA metadata and variable file dumping */

/*#define DEBUG_SPAR_MD_TARGET_TUNING*/         /* SPAR MD target bitrate tuning debug code */

/*#define DEBUG_SPAR_BYPASS_EVS_CODEC*/         /* bypass EVS coding in float precision, emulating EVS encoder/decoder delay */

/*#define DEBUG_SPAR_WRITE_OUT_COV*/            /* write covariance per frame into a text file for verification */

/*#define DEBUG_SPAR_DIRAC_WRITE_OUT_PRED_PARS*/

/*#define DEBUG_AGC*/                           /* debug SPAR AGC in-out */

#endif

/*#define SPAR_HOA_DBG*/                        /* SPAR HOA debug statements */

#define SPAR_HOA_DBG                        /* SPAR HOA debug statements */

/*#define DEBUG_BINAURAL_FILTER_DESIGN*/        /* debugging of Crend binaural filter design */



#endif

lib_debug/sba_debug.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
#include "ivas_cnst.h"

#include "tinywaveout_c.h"



extern WAVEFILEOUT *spar_foa_dec_wav[4];



#ifdef DEBUG_AGC

void ivas_close_agc_debug_files( void );

void ivas_open_agc_debug_files( int16_t agc );

lib_dec/ivas_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "wmops.h"



#ifdef DEBUG_SBA_AUDIO_DUMP

extern WAVEFILEOUT *spar_foa_dec_wav[4];



extern int16_t numTransportChannels;

#endif
@@ -283,9 +283,8 @@ ivas_error ivas_dec( 
            }

        }

#ifdef DEBUG_SBA_AUDIO_DUMP

        numTransportChannels = st_ivas->nchan_transport;

        /* Dump audio signal after core-decoding */

        ivas_spar_dump_signal_wav( output_frame, NULL, output, numTransportChannels, spar_foa_dec_wav[0], "core-decoding" );

        ivas_spar_dump_signal_wav( output_frame, NULL, output, st_ivas->nchan_transport, spar_foa_dec_wav[0], "core-decoding" );

#endif

        /* TCs remapping */

        nchan_remapped = st_ivas->nchan_transport;

lib_dec/ivas_spar_decoder.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "wmops.h"



#ifdef DEBUG_SBA_AUDIO_DUMP

extern WAVEFILEOUT *spar_foa_dec_wav[4];

extern int16_t numTransportChannels;

extern int16_t pca_ingest_channels;

extern int16_t numOutChannels;