Commit e3af3a7d authored by BOHMRR's avatar BOHMRR
Browse files

decoder: simplified _debug_files() calls

parent 936956b8

apps/decoder.c

+2 −11
Original line number Diff line number Diff line
@@ -396,12 +396,7 @@ int main( 
    }



#ifdef DEBUG_SBA

    spar_debug_t dbg_params;

    dbg_params.fs = arg.output_Fs;

    dbg_params.n_ch = numOutChannels;

    dbg_params.n_transport = numTransportChannels;

    dbg_params.pca_ingest_channels = pca_ingest_channels;

    ivas_open_decoder_debug_files( &dbg_params );

    ivas_open_decoder_debug_files( arg.output_Fs, numOutChannels, numTransportChannels );

#endif



    /*-----------------------------------------------------------------*
@@ -586,11 +581,7 @@ cleanup: 
    }



#ifdef DEBUG_SBA

    dbg_params.fs = arg.output_Fs;

    dbg_params.n_ch = numOutChannels;

    dbg_params.n_transport = numTransportChannels;

    dbg_params.pca_ingest_channels = pca_ingest_channels;

    ivas_close_decoder_debug_files( &dbg_params );

    ivas_close_decoder_debug_files( arg.output_Fs, numOutChannels, numTransportChannels, pca_ingest_channels );

#endif

#ifdef DEBUGGING

    dbgclose();

lib_debug/sba_debug.c

+14 −14
Original line number Diff line number Diff line
@@ -219,26 +219,26 @@ float ivas_spar_dump_signal_wav( int16_t input_frame, float data_f[][L_FRAME48k 
    return ( db_value );

}



void ivas_close_decoder_debug_files( spar_debug_t *pDebug_params )

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

{

    if ( spar_foa_dec_wav[0] != NULL )

    {

        UpdateWave( pDebug_params->fs, pDebug_params->n_transport, 32, spar_foa_dec_wav[0] );

        UpdateWave( fs, n_transport, 32, spar_foa_dec_wav[0] );

        CloseWav( spar_foa_dec_wav[0] );

    }

    if ( spar_foa_dec_wav[1] != NULL )

    {

        UpdateWave( pDebug_params->fs, pDebug_params->n_transport, 16, spar_foa_dec_wav[1] );

        UpdateWave( fs, n_transport, 16, spar_foa_dec_wav[1] );

        CloseWav( spar_foa_dec_wav[1] );

    }

    if ( spar_foa_dec_wav[2] != NULL )

    {

        UpdateWave( pDebug_params->fs, pDebug_params->pca_ingest_channels, 16, spar_foa_dec_wav[2] );

        UpdateWave( fs, pca_ingest_channels, 16, spar_foa_dec_wav[2] );

        CloseWav( spar_foa_dec_wav[2] );

    }

    if ( spar_foa_dec_wav[3] != NULL )

    {

        UpdateWave( pDebug_params->fs, pDebug_params->n_ch, 16, spar_foa_dec_wav[3] );

        UpdateWave( fs, n_ch, 16, spar_foa_dec_wav[3] );

        CloseWav( spar_foa_dec_wav[3] );

    }

}
@@ -274,38 +274,38 @@ void ivas_close_remove_debug_files( void ) 
      fclose(fp); */

}



void ivas_open_decoder_debug_files( spar_debug_t *pDebug_params )

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

{

    int8_t fb_wav_dump_path[4][MAX_PLUG_IN_FILE_LEN] = { "", "", "", "" };

    cstrcat( (char *) fb_wav_dump_path[0], sizeof( fb_wav_dump_path[0] ), "dec_out.wav" );

    spar_foa_dec_wav[0] = CreateWav(

        (const char *) fb_wav_dump_path[0],

        pDebug_params->fs,

        pDebug_params->n_ch,

        fs,

        n_ch,

        32

        /* const uint32_t writeWaveExt */

    );

    cstrcat( (char *) fb_wav_dump_path[1], sizeof( fb_wav_dump_path[1] ), "agc_dec_out.wav" );

    spar_foa_dec_wav[1] = CreateWav(

        (const char *) fb_wav_dump_path[1],

        pDebug_params->fs,

        pDebug_params->n_transport,

        fs,

        n_transport,

        16

        /* const uint32_t writeWaveExt */

    );

    cstrcat( (char *) fb_wav_dump_path[2], sizeof( fb_wav_dump_path[2] ), "pca_dec.wav" );

    spar_foa_dec_wav[2] = CreateWav(

        (const char *) fb_wav_dump_path[2],

        pDebug_params->fs,

        pDebug_params->n_transport,

        fs,

        n_transport,

        16

        /* const uint32_t writeWaveExt */

    );

    cstrcat( (char *) fb_wav_dump_path[3], sizeof( fb_wav_dump_path[3] ), "cldfbSynthesis.wav" );

    spar_foa_dec_wav[3] = CreateWav(

        (const char *) fb_wav_dump_path[3],

        pDebug_params->fs,

        pDebug_params->n_transport,

        fs,

        n_transport,

        16

        /* const uint32_t writeWaveExt */

    );

lib_debug/sba_debug.h

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ void ivas_open_agc_debug_files( spar_debug_t *pDebug_params ); 
float ivas_spar_dump_signal_wav( int16_t input_frame, float data_f[][L_FRAME48k * 2], int16_t no_channel, WAVEFILEOUT *wave_file );

void ivas_close_remove_debug_files( void );

void ivas_open_debug_files( spar_debug_t *pDebug_params );

void ivas_close_decoder_debug_files( spar_debug_t *pDebug_params );

void ivas_open_decoder_debug_files( spar_debug_t *dbg_params );

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 );

#endif

lib_dec/ivas_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
float data_array[IVAS_MAX_NUM_CH][L_FRAME48k * 2];

extern WAVEFILEOUT *spar_foa_dec_wav[4];

extern int16_t numTransportChannels;

extern int16_t numOutChannels;

#endif



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