diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-10-04 22:07:52 -0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-10-05 00:09:00 -0400 |
| commit | 386883179a68467ec35dd1c481100ad5915081f0 (patch) | |
| tree | 66eec7a977ae7b38f997b94561b1e6084fa9fc67 /silk | |
| parent | ae5f5cc1c5d9919cc66efec2eea97f673228da44 (diff) | |
| download | opus-386883179a68467ec35dd1c481100ad5915081f0.tar.gz | |
Fixing some opus_int vs opus_int32 mismatches
Reported by Mark Warner.
Diffstat (limited to 'silk')
| -rw-r--r-- | silk/fixed/pitch_analysis_core_FIX.c | 4 | ||||
| -rw-r--r-- | silk/quant_LTP_gains.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/silk/fixed/pitch_analysis_core_FIX.c b/silk/fixed/pitch_analysis_core_FIX.c index 03ea28d0..8df109e6 100644 --- a/silk/fixed/pitch_analysis_core_FIX.c +++ b/silk/fixed/pitch_analysis_core_FIX.c @@ -103,8 +103,8 @@ opus_int silk_pitch_analysis_core( /* O Voicing estimate: 0 VARDECL( opus_int16, C ); VARDECL( opus_int32, xcorr32 ); const opus_int16 *target_ptr, *basis_ptr; - opus_int32 cross_corr, normalizer, energy, shift, energy_basis, energy_target; - opus_int d_srch[ PE_D_SRCH_LENGTH ], Cmax, length_d_srch, length_d_comp; + opus_int32 cross_corr, normalizer, energy, energy_basis, energy_target; + opus_int d_srch[ PE_D_SRCH_LENGTH ], Cmax, length_d_srch, length_d_comp, shift; VARDECL( opus_int16, d_comp ); opus_int32 sum, threshold, lag_counter; opus_int CBimax, CBimax_new, CBimax_old, lag, start_lag, end_lag, lag_new; diff --git a/silk/quant_LTP_gains.c b/silk/quant_LTP_gains.c index 19f555a9..d6b8eff8 100644 --- a/silk/quant_LTP_gains.c +++ b/silk/quant_LTP_gains.c @@ -52,7 +52,8 @@ void silk_quant_LTP_gains( const opus_uint8 *cbk_gain_ptr_Q7; const opus_int32 *XX_Q17_ptr, *xX_Q17_ptr; opus_int32 res_nrg_Q15_subfr, res_nrg_Q15, rate_dist_Q7_subfr, rate_dist_Q7, min_rate_dist_Q7; - opus_int32 sum_log_gain_tmp_Q7, best_sum_log_gain_Q7, max_gain_Q7, gain_Q7; + opus_int32 sum_log_gain_tmp_Q7, best_sum_log_gain_Q7, max_gain_Q7; + opus_int gain_Q7; /***************************************************/ /* iterate over different codebooks with different */ |