Commit ce3764e5 authored by BOHMRR's avatar BOHMRR
Browse files

fixed number of channels in _pca_enc.wav dump signal

parent 993a334e

apps/encoder.c

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


#ifdef DEBUG_SBA

int16_t numTransportChannelsEnc = 1;

int16_t numInputChannels = 1;

#endif



/*------------------------------------------------------------------------------------------*
@@ -560,7 +559,7 @@ int main( 
#ifdef DEBUG_AGC

    ivas_open_agc_debug_files( (int16_t) arg.agc );

#endif

    ivas_open_encoder_debug_files( arg.inputFs, numInputChannels, numTransportChannelsEnc, arg.dbg_file_tag, arg.initBitrate, (int16_t) arg.dtxConfig.enabled );

    ivas_open_encoder_debug_files( arg.inputFs, numTransportChannelsEnc, arg.dbg_file_tag, arg.initBitrate, (int16_t) arg.dtxConfig.enabled );

#endif



    if ( !arg.quietModeEnabled )

lib_debug/sba_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ void ivas_open_decoder_debug_files( int32_t fs, int16_t n_ch, int16_t n_transpor 
    );

}



void ivas_open_encoder_debug_files( int32_t fs, int16_t n_ch, int16_t n_transport, const char *file_tag, int32_t ivas_total_brate, int16_t dtx_on )

void ivas_open_encoder_debug_files( int32_t fs, int16_t n_transport, const char *file_tag, int32_t ivas_total_brate, int16_t dtx_on )

{

    int8_t fb_wav_dump_path[3][MAX_PLUG_IN_FILE_LEN] = { "spar_foa_enc", "spar_foa_enc", "spar_foa_enc" };

    if ( file_tag != NULL )
@@ -388,7 +388,7 @@ void ivas_open_encoder_debug_files( int32_t fs, int16_t n_ch, int16_t n_transpor 
    spar_foa_enc_wav[0] = CreateWav(

        (const char *) fb_wav_dump_path[0],

        fs,

        n_ch,

        n_transport,

        16

        /* const uint32_t writeWaveExt */

    );

lib_debug/sba_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ void ivas_open_agc_debug_files( int16_t agc ); 
#endif

void ivas_spar_dump_signal_wav( int16_t input_frame, float **ppPcm, float pcm_array[IVAS_MAX_NUM_CH][L_FRAME48k], int16_t no_channel, WAVEFILEOUT *wave_file, char *location );

void ivas_close_remove_debug_files( void );

void ivas_open_encoder_debug_files( int32_t fs, int16_t n_ch, int16_t n_transport, const char *file_tag, int32_t ivas_total_brate, int16_t dtx_on );

void ivas_open_encoder_debug_files( int32_t fs, int16_t n_transport, const char *file_tag, int32_t ivas_total_brate, int16_t dtx_on );

void ivas_close_decoder_debug_files( int32_t fs, int16_t n_ch, int16_t n_transport, int16_t pca_ingest_channels );

void ivas_open_decoder_debug_files( int32_t fs, int16_t n_ch, int16_t n_transport );

void UpdateWave( const uint32_t sampleRate, const uint32_t numChannels, const uint32_t bps, WAVEFILEOUT *spar_wav );

lib_enc/ivas_spar_encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static ivas_error ivas_spar_enc_process( 
        }

    }

#ifdef DEBUG_SBA_AUDIO_DUMP

    ivas_spar_dump_signal_wav( input_frame, p_pcm_tmp, NULL, nchan_inp, spar_foa_enc_wav[0], "ivas_pca_enc()" );

    ivas_spar_dump_signal_wav( input_frame, p_pcm_tmp, NULL, nchan_transport, spar_foa_enc_wav[0], "ivas_pca_enc()" );

#endif

lib_enc/lib_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 


#ifdef DEBUG_SBA_AUDIO_DUMP

extern int16_t numTransportChannelsEnc;

extern int16_t numInputChannels;

#endif



/*---------------------------------------------------------------------*
@@ -472,7 +471,6 @@ ivas_error IVAS_ENC_ConfigureForAmbisonics( 
    error = configureEncoder( hIvasEnc, inputFs, bitrate, maxBandwidth, dtxConfig, IVAS_ENC_GetDefaultChannelAwareConfig() );



#ifdef DEBUG_SBA_AUDIO_DUMP

    numInputChannels = hEncoderConfig->nchan_inp;

    numTransportChannelsEnc = hIvasEnc->st_ivas->nchan_transport;

#endif