Commit 8a993e92 authored by michael's avatar michael

Remove mathops.h dependancy.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14897 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f10d76a8
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "acelp_filters.h" #include "acelp_filters.h"
#define FRAC_BITS 13
#include "mathops.h"
const int16_t ff_acelp_interp_filter[61] = const int16_t ff_acelp_interp_filter[61] =
{ /* (0.15) */ { /* (0.15) */
...@@ -152,8 +150,8 @@ void ff_acelp_high_pass_filter( ...@@ -152,8 +150,8 @@ void ff_acelp_high_pass_filter(
for(i=0; i<length; i++) for(i=0; i<length; i++)
{ {
tmp = MULL(hpf_f[0], 15836); /* (14.13) = (13.13) * (1.13) */ tmp = (hpf_f[0]* 15836LL)>>13; /* (14.13) = (13.13) * (1.13) */
tmp += MULL(hpf_f[1], -7667); /* (13.13) = (13.13) * (0.13) */ tmp += (hpf_f[1]* -7667LL)>>13; /* (13.13) = (13.13) * (0.13) */
tmp += 7699 * (in[i] - 2*in[i-1] + in[i-2]); /* (14.13) = (0.13) * (14.0) */ tmp += 7699 * (in[i] - 2*in[i-1] + in[i-2]); /* (14.13) = (0.13) * (14.0) */
out[i] = av_clip_int16((tmp + 0x800) >> 12); /* (15.0) = 2 * (13.13) = (14.13) */ out[i] = av_clip_int16((tmp + 0x800) >> 12); /* (15.0) = 2 * (13.13) = (14.13) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment