From 1384e2705470e9603a2ed2fdaff801a9cc6b2758 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 26 May 2008 23:36:05 +0000 Subject: [PATCH] consistency cosmetics: indices --> indexes in variable names Originally committed as revision 13446 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/acelp_vectors.c | 8 +++---- libavcodec/acelp_vectors.h | 4 ++-- libavcodec/ppc/mpegvideo_altivec.c | 36 +++++++++++++++--------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libavcodec/acelp_vectors.c b/libavcodec/acelp_vectors.c index d981fbdc31..cae6318fa0 100644 --- a/libavcodec/acelp_vectors.c +++ b/libavcodec/acelp_vectors.c @@ -106,7 +106,7 @@ void ff_acelp_fc_pulse_per_track( int16_t* fc_v, const uint8_t *tab1, const uint8_t *tab2, - int pulse_indices, + int pulse_indexes, int pulse_signs, int pulse_count, int bits) @@ -116,14 +116,14 @@ void ff_acelp_fc_pulse_per_track( for(i=0; i>= bits; + pulse_indexes >>= bits; pulse_signs >>= 1; } - fc_v[tab2[pulse_indices]] += (pulse_signs & 1) ? 8191 : -8192; + fc_v[tab2[pulse_indexes]] += (pulse_signs & 1) ? 8191 : -8192; } void ff_acelp_weighted_vector_sum( diff --git a/libavcodec/acelp_vectors.h b/libavcodec/acelp_vectors.h index 53901a9f81..ba865e9d6d 100644 --- a/libavcodec/acelp_vectors.h +++ b/libavcodec/acelp_vectors.h @@ -105,7 +105,7 @@ extern const uint8_t ff_fc_2pulses_9bits_track2_gray[32]; * \param fc_v [out] decoded fixed codebook vector (2.13) * \param tab1 table used for first pulse_count pulses * \param tab2 table used for last pulse - * \param pulse_indices fixed codebook indexes + * \param pulse_indexes fixed codebook indexes * \param pulse_signs signs of the excitation pulses (0 bit value * means negative sign) * \param bits number of bits per one pulse index @@ -118,7 +118,7 @@ void ff_acelp_fc_pulse_per_track( int16_t* fc_v, const uint8_t *tab1, const uint8_t *tab2, - int pulse_indices, + int pulse_indexes, int pulse_signs, int pulse_count, int bits); diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index 14cc6ce856..9832fb96a4 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -383,7 +383,7 @@ int dct_quantize_altivec(MpegEncContext* s, { vector bool char zero_01, zero_23, zero_45, zero_67; - vector signed char scanIndices_01, scanIndices_23, scanIndices_45, scanIndices_67; + vector signed char scanIndexes_01, scanIndexes_23, scanIndexes_45, scanIndexes_67; vector signed char negOne = vec_splat_s8(-1); vector signed char* scanPtr = (vector signed char*)(s->intra_scantable.inverse); @@ -400,38 +400,38 @@ int dct_quantize_altivec(MpegEncContext* s, vec_cmpeq(data7, (vector signed short)zero)); // 64 biggest values - scanIndices_01 = vec_sel(scanPtr[0], negOne, zero_01); - scanIndices_23 = vec_sel(scanPtr[1], negOne, zero_23); - scanIndices_45 = vec_sel(scanPtr[2], negOne, zero_45); - scanIndices_67 = vec_sel(scanPtr[3], negOne, zero_67); + scanIndexes_01 = vec_sel(scanPtr[0], negOne, zero_01); + scanIndexes_23 = vec_sel(scanPtr[1], negOne, zero_23); + scanIndexes_45 = vec_sel(scanPtr[2], negOne, zero_45); + scanIndexes_67 = vec_sel(scanPtr[3], negOne, zero_67); // 32 largest values - scanIndices_01 = vec_max(scanIndices_01, scanIndices_23); - scanIndices_45 = vec_max(scanIndices_45, scanIndices_67); + scanIndexes_01 = vec_max(scanIndexes_01, scanIndexes_23); + scanIndexes_45 = vec_max(scanIndexes_45, scanIndexes_67); // 16 largest values - scanIndices_01 = vec_max(scanIndices_01, scanIndices_45); + scanIndexes_01 = vec_max(scanIndexes_01, scanIndexes_45); // 8 largest values - scanIndices_01 = vec_max(vec_mergeh(scanIndices_01, negOne), - vec_mergel(scanIndices_01, negOne)); + scanIndexes_01 = vec_max(vec_mergeh(scanIndexes_01, negOne), + vec_mergel(scanIndexes_01, negOne)); // 4 largest values - scanIndices_01 = vec_max(vec_mergeh(scanIndices_01, negOne), - vec_mergel(scanIndices_01, negOne)); + scanIndexes_01 = vec_max(vec_mergeh(scanIndexes_01, negOne), + vec_mergel(scanIndexes_01, negOne)); // 2 largest values - scanIndices_01 = vec_max(vec_mergeh(scanIndices_01, negOne), - vec_mergel(scanIndices_01, negOne)); + scanIndexes_01 = vec_max(vec_mergeh(scanIndexes_01, negOne), + vec_mergel(scanIndexes_01, negOne)); // largest value - scanIndices_01 = vec_max(vec_mergeh(scanIndices_01, negOne), - vec_mergel(scanIndices_01, negOne)); + scanIndexes_01 = vec_max(vec_mergeh(scanIndexes_01, negOne), + vec_mergel(scanIndexes_01, negOne)); - scanIndices_01 = vec_splat(scanIndices_01, 0); + scanIndexes_01 = vec_splat(scanIndexes_01, 0); - vec_ste(scanIndices_01, 0, &lastNonZeroChar); + vec_ste(scanIndexes_01, 0, &lastNonZeroChar); lastNonZero = lastNonZeroChar;