Commit f0ccf6be authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 92-spar-code-redundancies

parents 5cd288ff 5e0a9b77

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
#define CORECODER_BITRATE_SWITCHING                     /* Issue 133: support bitrate switching in core-coder */

#define ISM_BITRATE_SWITCHING                           /* Issue 115: Support for Bitrate Switching in ISM */

#define SBA_SPAR_HARM                                   /* Issue 92: maintenance of the SBA SPAR functions */

#define FIX_155_HP20_ISSUE                              /* Issue 155: apply hp20 on all input channels instead of just 2 channels */

lib_debug/sba_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -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 )

lib_debug/sba_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -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 );

lib_dec/ivas_spar_md_dec.c

+15 −11
Original line number Diff line number Diff line
@@ -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

    

    /* for ( b = 0; b < 1; b++)

#ifdef DEBUG_SBA_MD_DUMP

        {

            fprintf( stdout, "\n\nMixer Matrix band %d\n\n", b );

            static FILE *f_mat = 0;



            if ( f_mat == 0 )

                f_mat = fopen( "mixer_mat_dec", "w" );



            for ( i = 0; i < num_out_ch; i++ )

            {

                for ( j = 0; j < num_out_ch; j++ )

                {

                            fprintf( stdout, "%.2f,\t", hMdDec->mixer_mat[i][j][0][b] );

                    for ( b = 0; b < num_bands_out; 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 );

lib_enc/ivas_init_enc.c

+6 −0
Original line number Diff line number Diff line
@@ -190,6 +190,12 @@ int16_t getNumChanAnalysis( 
    {

        n = st_ivas->hEncoderConfig->nchan_inp;

    }

#ifdef FIX_155_HP20_ISSUE

    else if ( st_ivas->hEncoderConfig->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM )

    {

        n = st_ivas->hEncoderConfig->nchan_inp;

    }

#endif



    return n;

}