[FFmpeg-soc] [soc]: r4105 - amr/amrnbfloatdec.c
kmalaussene
subversion at mplayerhq.hu
Sun Feb 22 01:12:36 CET 2009
Author: kmalaussene
Date: Sun Feb 22 01:12:36 2009
New Revision: 4105
Log:
Reindent after previous commit.
Modified:
amr/amrnbfloatdec.c
Modified: amr/amrnbfloatdec.c
==============================================================================
--- amr/amrnbfloatdec.c Sun Feb 22 01:11:14 2009 (r4104)
+++ amr/amrnbfloatdec.c Sun Feb 22 01:12:36 2009 (r4105)
@@ -495,25 +495,25 @@ static void interp_pitch_vector(float *p
static void decode_pitch_vector(AMRContext *p, const AMRNBSubframe *amr_subframe, const int subframe)
{
- // find the search range
- p->search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN);
- p->search_range_max = p->search_range_min + 9;
- if(p->search_range_max > PITCH_LAG_MAX) {
- p->search_range_max = PITCH_LAG_MAX;
- p->search_range_min = p->search_range_max - 9;
- }
+ // find the search range
+ p->search_range_min = FFMAX(p->prev_pitch_lag_int - 5, p->cur_frame_mode == MODE_122 ? PITCH_LAG_MIN_MODE_122 : PITCH_LAG_MIN);
+ p->search_range_max = p->search_range_min + 9;
+ if(p->search_range_max > PITCH_LAG_MAX) {
+ p->search_range_max = PITCH_LAG_MAX;
+ p->search_range_min = p->search_range_max - 9;
+ }
- // decode integer and fractional parts of pitch lag from parsed pitch
- // index
- if(p->cur_frame_mode == MODE_122) {
- decode_pitch_lag_6(p, amr_subframe->p_lag, subframe);
- }else {
- decode_pitch_lag_3(p, amr_subframe->p_lag, subframe);
- }
+ // decode integer and fractional parts of pitch lag from parsed pitch
+ // index
+ if(p->cur_frame_mode == MODE_122) {
+ decode_pitch_lag_6(p, amr_subframe->p_lag, subframe);
+ }else {
+ decode_pitch_lag_3(p, amr_subframe->p_lag, subframe);
+ }
- // interpolate the past excitation at the pitch lag to obtain the pitch
- // vector
- interp_pitch_vector(p->excitation, p->pitch_lag_int, p->pitch_lag_frac, p->cur_frame_mode);
+ // interpolate the past excitation at the pitch lag to obtain the pitch
+ // vector
+ interp_pitch_vector(p->excitation, p->pitch_lag_int, p->pitch_lag_frac, p->cur_frame_mode);
}
/// @}
More information about the FFmpeg-soc
mailing list