diff --git a/lib_debug/sba_debug.c b/lib_debug/sba_debug.c index fb3b208f3f4da4679798bdfa353c55804efd2237..68fd39f4c083e412ef023a1e357fd1fe52710608 100644 --- a/lib_debug/sba_debug.c +++ b/lib_debug/sba_debug.c @@ -185,7 +185,7 @@ static void UpdateWave( void ivas_spar_dump_signal_wav( const int16_t input_frame, float **ppPcm, - float pcm_array[IVAS_MAX_NUM_CH][L_FRAME48k], + float pcm_array[IVAS_SPAR_MAX_CH][L_FRAME48k], const int16_t no_channel, WAVEFILEOUT *wave_file, char *location ) diff --git a/lib_debug/sba_debug.h b/lib_debug/sba_debug.h index 8153929286aa6218177b16d97ea0d9b0b2ed432e..86e07e5a41ae08d484b655c131f37ce2c9b6dd97 100644 --- a/lib_debug/sba_debug.h +++ b/lib_debug/sba_debug.h @@ -50,7 +50,7 @@ extern WAVEFILEOUT *spar_foa_dec_wav[4]; void ivas_close_agc_debug_files( void ); void ivas_open_agc_debug_files( int16_t agc ); #endif -void ivas_spar_dump_signal_wav( const int16_t input_frame, float **ppPcm, float pcm_array[IVAS_MAX_NUM_CH][L_FRAME48k], const int16_t no_channel, WAVEFILEOUT *wave_file, char *location ); +void ivas_spar_dump_signal_wav( const int16_t input_frame, float **ppPcm, float pcm_array[IVAS_SPAR_MAX_CH][L_FRAME48k], const int16_t no_channel, WAVEFILEOUT *wave_file, char *location ); void ivas_close_sba_encoder_debug_files( void ); void ivas_open_sba_encoder_debug_files( const int32_t fs, const int16_t n_transport, const char *file_tag, const int32_t ivas_total_brate, const int16_t dtx_on ); void ivas_close_sba_decoder_debug_files( const int32_t fs, const int16_t n_ch, const int16_t n_transport, const int16_t pca_ingest_channels ); diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c index 7f01f64c0fd1bf545c535965f0ad9847935c9125..f192228e81c085c759d91fb093269ca7b8a46dbb 100644 --- a/lib_dec/ivas_spar_md_dec.c +++ b/lib_dec/ivas_spar_md_dec.c @@ -645,7 +645,7 @@ void ivas_spar_md_dec_process( ( b == 0 && frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; for ( j = 0; j < ( hMdDec->spar_md_cfg.num_decorr_per_band[bw * b] - hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] ); j++ ) { - for ( int16_t k = 0; k < hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] - 1; k++ ) + for ( k = 0; k < hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] - 1; k++ ) { dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[j][k], sizeof( float ), 1, 1, f_name ); } @@ -1396,23 +1396,27 @@ void ivas_spar_dec_gen_umx_mat( } } } - } -#ifdef SPAR_HOA_DBG + +#ifdef DEBUG_SBA_MD_DUMP + { + static FILE *f_mat = 0; + + if ( f_mat == 0 ) + f_mat = fopen( "mixer_mat_dec", "w" ); - /* for ( b = 0; b < 1; b++) - { - fprintf( stdout, "\n\nMixer Matrix band %d\n\n", b ); for ( i = 0; i < num_out_ch; i++ ) { - for ( j = 0; j < num_out_ch; j++ ) + for ( j = 0; j < num_out_ch; j++ ) + { + for ( b = 0; b < num_bands_out; b++ ) { - fprintf( stdout, "%.2f,\t", hMdDec->mixer_mat[i][j][0][b] ); + fprintf( f_mat, "%f\n", hMdDec->mixer_mat[i][j][b + i_ts * IVAS_MAX_NUM_BANDS] ); } - fprintf( stdout, "\n" ); + } } - fprintf( stdout, "\n" ); - }*/ + } #endif + } ivas_spar_dec_compute_ramp_down_post_matrix( hMdDec, num_bands_out, bfi ); diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index 6c17a5711e19a806a14889faa0561b3292b24dcb..988a8fa01398ff7fbf93cb5d2cd67598a6162935 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -788,6 +788,7 @@ static ivas_error ivas_spar_enc_process( #ifdef DEBUG_SBA_MD_DUMP { + int16_t k; static FILE *f_mat = 0; if ( f_mat == 0 ) diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c index 7ae45903d5916df496d3c31466eefacf00318729..ce8a0e3bc176332fce4415a4ddee6ace2dc1de9b 100644 --- a/lib_enc/ivas_spar_md_enc.c +++ b/lib_enc/ivas_spar_md_enc.c @@ -1033,6 +1033,8 @@ ivas_error ivas_spar_md_enc_process( byte_size = sizeof( float ); for ( b = 0; b < nB; b++ ) { + ndm = hMdEnc->spar_md_cfg.num_dmx_chans_per_band[b * bands_bw]; + sprintf( f_name, "spar_band_pred_coeffs.bin" ); ( b == 0 && frame == 0 ) ? dbgwrite( &nB, sizeof( nB ), 1, 1, f_name ) : false; num_elements = num_ch - 1;