Commit e86a8b5f authored by thomas dettbarn's avatar thomas dettbarn
Browse files

the cholesky_fixed64 function returns Q10 instead of Q18 now.

parent df4ab5e6

lib_com/ivas_tools.c

+5 −4
Original line number Diff line number Diff line
@@ -660,10 +660,11 @@ Word64 dot_product_cholesky_fixed64( 
    Word16 i, j;

    Word64 suma, tmp_sum;

    Word32 mul;

    Word32 tmp;

    const Word32 *pt_x, *pt_A;

    pt_A = A;

    suma = 0;

    move32();

    move64();

    FOR( i = 0; i < N; i++ )

    {

        tmp_sum = 0;
@@ -675,10 +676,10 @@ Word64 dot_product_cholesky_fixed64( 
            mul = Mpy_32_32( *pt_x++, *pt_A++ );

            tmp_sum = W_add( tmp_sum, W_deposit32_l( mul ) );

        }



        suma = W_mac_32_32( suma, tmp_sum, tmp_sum );	// TODO: make sure that this does not overflow. 

        tmp_sum = W_shr( tmp_sum, 4 );	// to make sure that the tmp_sum will not overflow

        tmp = W_extract_l( tmp_sum );

        suma = W_mac_32_32( suma, tmp, tmp );

    }



    return suma;

}

void v_mult_mat_fixed(

lib_enc/speech_music_classif_fx.c

+6 −6
Original line number Diff line number Diff line
@@ -2271,16 +2271,16 @@ Word16 ivas_smc_gmm_fx( 
    FOR( m = 0; m < N_SMC_MIXTURES; m++ )

    {

        v_sub32_fx( FV_fx, &means_speech_fx[m * N_PCA_COEF], fvm_fx, N_PCA_COEF );

        wprob_fx = dot_product_cholesky_fixed64( fvm_fx, &prec_chol_speech_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF );

        ps_fx[m] = L_sub( L_sub( L_add( log_weights_speech_compute[m], log_det_chol_speech_fx[m] ), W_shr( wprob_fx, Q18 ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18

        wprob_fx = dot_product_cholesky_fixed64( fvm_fx, &prec_chol_speech_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF );	// Q10

        ps_fx[m] = L_sub( L_sub( L_add( log_weights_speech_compute[m], log_det_chol_speech_fx[m] ), W_shr( wprob_fx, Q10 ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18

        move32();

        v_sub32_fx( FV_fx, &means_music_fx[m * N_PCA_COEF], fvm_fx, N_PCA_COEF );

        wprob_fx = dot_product_cholesky_fixed64( fvm_fx, &prec_chol_music_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF );

        pm_fx[m] = L_sub( L_sub( L_add( log_weights_music_compute[m], log_det_chol_music_fx[m] ), W_shr( wprob_fx, Q18 ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18

        wprob_fx = dot_product_cholesky_fixed64( fvm_fx, &prec_chol_music_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF );	// Q10

        pm_fx[m] = L_sub( L_sub( L_add( log_weights_music_compute[m], log_det_chol_music_fx[m] ), W_shr( wprob_fx, Q10 ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18

        move32();

        v_sub32_fx( FV_fx, &means_noise_fx[m * N_PCA_COEF], fvm_fx, N_PCA_COEF );

        wprob_fx = dot_product_cholesky_fixed64( fvm_fx, &prec_chol_noise_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF );

        pn_fx[m] = L_sub( L_sub( L_add( log_weights_noise_compute[m], log_det_chol_noise_fx[m] ), W_shr( wprob_fx, Q18 ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18

        wprob_fx = dot_product_cholesky_fixed64( fvm_fx, &prec_chol_noise_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF );	// Q10

        pn_fx[m] = L_sub( L_sub( L_add( log_weights_noise_compute[m], log_det_chol_noise_fx[m] ), W_shr( wprob_fx, Q10 ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18

        move32();

    }