Originally committed as revision 23973 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -54,8 +54,8 @@ int ff_acelp_decode_8bit_to_1st_delay3(int ac_index); |
| 54 | 54 |
* Pitch delay is coded: |
| 55 | 55 |
* with 1/3 resolution, -6 < pitch_delay - int(prev_pitch_delay) < 5 |
| 56 | 56 |
* |
| 57 |
- * \remark The routine is used in G.729 @8k, AMR @10.2k, AMR @7.95k, |
|
| 58 |
- * AMR @7.4k for the second subframe. |
|
| 57 |
+ * \remark The routine is used in G.729 @@8k, AMR @@10.2k, AMR @@7.95k, |
|
| 58 |
+ * AMR @@7.4k for the second subframe. |
|
| 59 | 59 |
*/ |
| 60 | 60 |
int ff_acelp_decode_5_6_bit_to_2nd_delay3( |
| 61 | 61 |
int ac_index, |
| ... | ... |
@@ -74,8 +74,8 @@ int ff_acelp_decode_5_6_bit_to_2nd_delay3( |
| 74 | 74 |
* with 1/3 resolution, -2 < pitch_delay - int(prev_pitch_delay) < 1 |
| 75 | 75 |
* integers only, 1 <= pitch_delay - int(prev_pitch_delay) < 5 |
| 76 | 76 |
* |
| 77 |
- * \remark The routine is used in G.729 @6.4k, AMR @6.7k, AMR @5.9k, |
|
| 78 |
- * AMR @5.15k, AMR @4.75k for the second subframe. |
|
| 77 |
+ * \remark The routine is used in G.729 @@6.4k, AMR @@6.7k, AMR @@5.9k, |
|
| 78 |
+ * AMR @@5.15k, AMR @@4.75k for the second subframe. |
|
| 79 | 79 |
*/ |
| 80 | 80 |
int ff_acelp_decode_4bit_to_2nd_delay3( |
| 81 | 81 |
int ac_index, |
| ... | ... |
@@ -47,7 +47,7 @@ typedef struct {
|
| 47 | 47 |
* |
| 48 | 48 |
* Table contains only first the pulse indexes. |
| 49 | 49 |
* |
| 50 |
- * Used in G.729 @8k, G.729 @4.4k, AMR @7.95k, AMR @7.40k |
|
| 50 |
+ * Used in G.729 @@8k, G.729 @@4.4k, AMR @@7.95k, AMR @@7.40k |
|
| 51 | 51 |
*/ |
| 52 | 52 |
extern const uint8_t ff_fc_4pulses_8bits_tracks_13[16]; |
| 53 | 53 |
|
| ... | ... |
@@ -60,7 +60,7 @@ extern const uint8_t ff_fc_4pulses_8bits_tracks_13[16]; |
| 60 | 60 |
* |
| 61 | 61 |
* @remark Track in the table should be read top-to-bottom, left-to-right. |
| 62 | 62 |
* |
| 63 |
- * Used in G.729 @8k, G.729 @4.4k, AMR @7.95k, AMR @7.40k |
|
| 63 |
+ * Used in G.729 @@8k, G.729 @@4.4k, AMR @@7.95k, AMR @@7.40k |
|
| 64 | 64 |
*/ |
| 65 | 65 |
extern const uint8_t ff_fc_4pulses_8bits_track_4[32]; |
| 66 | 66 |
|
| ... | ... |
@@ -76,7 +76,7 @@ extern const uint8_t ff_fc_4pulses_8bits_track_4[32]; |
| 76 | 76 |
* @note (EE) Reference G.729D code also uses gray decoding for each |
| 77 | 77 |
* pulse index before looking up the value in the table. |
| 78 | 78 |
* |
| 79 |
- * Used in G.729 @6.4k (with gray coding), AMR @5.9k (without gray coding) |
|
| 79 |
+ * Used in G.729 @@6.4k (with gray coding), AMR @@5.9k (without gray coding) |
|
| 80 | 80 |
*/ |
| 81 | 81 |
extern const uint8_t ff_fc_2pulses_9bits_track1[16]; |
| 82 | 82 |
extern const uint8_t ff_fc_2pulses_9bits_track1_gray[16]; |
| ... | ... |
@@ -108,7 +108,7 @@ extern const uint8_t ff_fc_2pulses_9bits_track1_gray[16]; |
| 108 | 108 |
* @note (EE.2) Reference G.729D code also uses gray decoding for each |
| 109 | 109 |
* pulse index before looking up the value in the table. |
| 110 | 110 |
* |
| 111 |
- * Used in G.729 @6.4k (with gray coding) |
|
| 111 |
+ * Used in G.729 @@6.4k (with gray coding) |
|
| 112 | 112 |
*/ |
| 113 | 113 |
extern const uint8_t ff_fc_2pulses_9bits_track2_gray[32]; |
| 114 | 114 |
|
| ... | ... |
@@ -144,7 +144,7 @@ extern const float ff_pow_0_55[10]; |
| 144 | 144 |
* @param pulse_count number of pulses decoded using first table |
| 145 | 145 |
* @param bits length of one pulse index in bits |
| 146 | 146 |
* |
| 147 |
- * Used in G.729 @8k, G.729 @4.4k, G.729 @6.4k, AMR @7.95k, AMR @7.40k |
|
| 147 |
+ * Used in G.729 @@8k, G.729 @@4.4k, G.729 @@6.4k, AMR @@7.95k, AMR @@7.40k |
|
| 148 | 148 |
*/ |
| 149 | 149 |
void ff_acelp_fc_pulse_per_track(int16_t* fc_v, |
| 150 | 150 |
const uint8_t *tab1, |