Commit 8629f3b4 authored by Arthur Tritthart's avatar Arthur Tritthart Committed by Sandesh Venkatesh
Browse files

fixed issue with wrong q for prior variables - debug prints inactive

parent a6ea0a05

lib_com/ivas_cov_smooth_fx.c

+11 −6
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ static void ivas_calculate_smoothning_factor_fx( 
    *Smoothing_factor = L_shl_sat( L_deposit_h( tmp ), exp_diff  );                                 // Q31

    move32();

#ifdef DEBUG_ivas_compute_smooth_cov_fx

    printf( "Smoothing_factor %g  update_factor %g  min_pool_size %d  j=%d\n", 

    printf( "Smoothing_factor %e  update_factor %e  min_pool_size %d  j=%d\n", 

            (double) *Smoothing_factor * pow (2.0, -31),

            (double) update_factor + pow (2.0, -22.0), min_pool_size, j );

            (double) update_factor * pow (2.0, -22.0), min_pool_size, j );

#endif
@@ -341,7 +341,7 @@ static void ivas_compute_smooth_cov_fx( 
                hCovState->q_cov_real_per_band[i][i][k] = sub( Q31, cov_buf_e );

                move16();

#ifdef DEBUG_ivas_compute_smooth_cov_fx

                printf( "A: pCov_buf[%d][%d][%d] %g (0x%08X 0x%04X) fac %g  sm-factor %g  buf %g\n", i, i, k, 

                printf( "A: pCov_buf[%d][%d][%d] %e (0x%08X 0x%04X) fac %e  sm-factor %e  buf %e\n", i, i, k, 

                                    (double) pCov_buf[i][i][k] * pow( 2.0, (double) -hCovState->q_cov_real_per_band[i][i][k] ), 

                                    pCov_buf[i][i][k], 

                                    hCovState->q_cov_real_per_band[i][i][k] & 0xFFFF,
@@ -388,7 +388,7 @@ static void ivas_compute_smooth_cov_fx( 
                    move16();



#ifdef DEBUG_ivas_compute_smooth_cov_fx

                    printf( "B1: pCov_buf[%d][%d][%d] %g  fac %g  sm-factor %g  prior %g  buf %g (q=%d)\n", i, j, k, 

                    printf( "B1: pCov_buf[%d][%d][%d] %e  fac %e  sm-factor %e  prior %e  buf %e (q=%d)\n", i, j, k, 

                                      (double) pCov_buf[i][j][k] * pow( 2.0, (double) -hCovState->q_cov_real_per_band[i][j][k] ),

                                      (double) factor * pow( 2.0, (double) -q_fac ),

                                      (double) hCovState->pSmoothing_factor_fx[k] * pow( 2.0, -Q31 ),
@@ -397,6 +397,11 @@ static void ivas_compute_smooth_cov_fx( 
#endif



                }

                FOR( ; k < end_band; k++ )

                {

                    hCovState->q_cov_real_per_band[i][j][k] = q_cov[i][j];

                    move16();

                }

            }

        }

        FOR( i = 0; i < num_ch; i++ )
@@ -412,7 +417,7 @@ static void ivas_compute_smooth_cov_fx( 
                hCovState->q_cov_real_per_band[i][i][k] = sub( Q31, cov_buf_e ); // Q of pCov_buf[i][i][k]

                move16();

#ifdef DEBUG_ivas_compute_smooth_cov_fx

                printf( "B2: pCov_buf[%d][%d][%d] %g  fac %g  sm-factor %g  buf %g (q=%d)\n", i, i, k, 

                printf( "B2: pCov_buf[%d][%d][%d] %e  fac %e  sm-factor %e  buf %e (q=%d)\n", i, i, k, 

                                  (double) pCov_buf[i][i][k] * pow( 2.0, (double) -hCovState->q_cov_real_per_band[i][i][k] ),

                                  (double) fac * pow( 2.0, (double) -q_fac ),

                                  (double) hCovState->pSmoothing_factor_fx[k] * pow( 2.0, -Q31 ),
@@ -455,7 +460,7 @@ static void ivas_compute_smooth_cov_fx( 
                    hCovState->q_cov_real_per_band[i][j][k] = sub( Q31, cov_buf_e ); // Q of pCov_buf[i][j][k]

                    move16();

#ifdef DEBUG_ivas_compute_smooth_cov_fx

                    printf( "C: pCov_buf[%d][%d][%d] %g  factor %g  sm-factor %g  prior %g  buf %g (q=%d)\n", i, j, k, 

                    printf( "C: pCov_buf[%d][%d][%d] %e  factor %e  sm-factor %e  prior %e  buf %e (q=%d)\n", i, j, k, 

                                (double) pCov_buf[i][j][k] * pow(2.0, (double) -hCovState->q_cov_real_per_band[i][j][k]),

                                (double) factor * pow(2.0, (double) -q_fac),

                                (double) hCovState->pSmoothing_factor_fx[k] * pow(2.0, -Q31),