@@ -56,20 +56,6 @@ int ff_acelp_decode_5_6_bit_to_2nd_delay3(
return 3 * pitch_delay_min + ac_index - 2;
}
-int ff_acelp_decode_9bit_to_1st_delay6(int ac_index)
-{
- if(ac_index < 463)
- return ac_index + 105;
- else
- return 6 * (ac_index - 368);
-}
-int ff_acelp_decode_6bit_to_2nd_delay6(
- int ac_index,
- int pitch_delay_min)
-{
- return 6 * pitch_delay_min + ac_index - 3;
-}
-
void ff_acelp_update_past_gain(
int16_t* quant_energy,
int gain_corr_factor,
@@ -82,39 +82,6 @@ int ff_acelp_decode_4bit_to_2nd_delay3(
int ac_index,
int pitch_delay_min);
-/**
- * @brief Decode pitch delay of the first subframe encoded by 9 bits
- * with 1/6 precision.
- * @param ac_index adaptive codebook index (9 bits)
- *
- * @return pitch delay in 1/6 units
- *
- * Pitch delay is coded:
- * with 1/6 resolution, 17 < pitch_delay < 95
- * integers only, 95 <= pitch_delay <= 143
- *
- * @remark The routine is used in AMR @@12.2k for the first and third subframes.
- */
-int ff_acelp_decode_9bit_to_1st_delay6(int ac_index);
-
-/**
- * @brief Decode pitch delay of the second subframe encoded by 6 bits
- * with 1/6 precision.
- * @param ac_index adaptive codebook index (6 bits)
- * @param pitch_delay_min lower bound (integer) of pitch delay interval for
- * second subframe
- *
- * @return pitch delay in 1/6 units
- *
- * Pitch delay is coded:
- * with 1/6 resolution, -6 < pitch_delay - int(prev_pitch_delay) < 5
- *
- * @remark The routine is used in AMR @@12.2k for the second and fourth subframes.
- */
-int ff_acelp_decode_6bit_to_2nd_delay6(
- int ac_index,
- int pitch_delay_min);
-
/**
* @brief Update past quantized energies
* @param[in,out] quant_energy past quantized energies (5.10)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/acelp_pitch_delay.c | 14 -------------- libavcodec/acelp_pitch_delay.h | 33 --------------------------------- 2 files changed, 47 deletions(-)