Commit fe139bcb authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 22-terminology-for-the-number-of-channels

parents 4fa66a37 b59d9282

lib_com/ivas_cov_smooth.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ void ivas_cov_smooth_process( 
#ifdef SBA_SPAR_HARM

    ivas_compute_smooth_cov( hCovState, pFb, cov_real, hCovState->pPrior_cov_real, 1e-20f, start_band, end_band, nchan, transient_det );

#else

    ivas_compute_smooth_cov( hCovState, pFb, pIn_buf->cov_real, hCovState->pPrior_cov_real, 1e-20f, start_band, end_band, nchan, transient_det );

    ivas_compute_smooth_cov( hCovState, pIn_buf, pFb, pIn_buf->cov_real, hCovState->pPrior_cov_real, 1e-20f, start_band, end_band );

#endif



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

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

                }
@@ -1389,23 +1389,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_ism_param_enc.c

+6 −3
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ 
#include "ivas_rom_com.h"

#include "wmops.h"





#ifndef FIX_155_HP20_ISSUE

#ifdef CORECODER_BITRATE_SWITCHING

static ivas_error ivas_hp20_reconfig( Encoder_Struct *st_ivas, const int16_t nchan_hp20_old );

#endif



#endif

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

 * Local function definitions

 *------------------------------------------------------------------------*/
@@ -534,6 +534,7 @@ ivas_error ivas_ism_enc_config( 
            st_ivas->hDirAC = NULL;

        }



#ifndef FIX_155_HP20_ISSUE

#ifdef CORECODER_BITRATE_SWITCHING

        ivas_hp20_reconfig( st_ivas, nchan_transport_old );

#else
@@ -574,6 +575,7 @@ ivas_error ivas_ism_enc_config( 


            set_f( st_ivas->mem_hp20_in[sce_id], 0.0f, L_HP20_MEM );

        }

#endif

#endif

    }

#else
@@ -588,7 +590,7 @@ ivas_error ivas_ism_enc_config( 
    return error;

}





#ifndef FIX_155_HP20_ISSUE

#ifdef CORECODER_BITRATE_SWITCHING

// VE: this is the same function as at the decoder -> harmonize them to a new file ivas_corecoder_reconfig.c

/*-------------------------------------------------------------------*
@@ -674,3 +676,4 @@ static ivas_error ivas_hp20_reconfig( 
    return error;

}

#endif

#endif