Mercurial > libavcodec.hg

changeset 7653:155ec22a635a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove mathops.h dependancy.
author michael
date Thu, 21 Aug 2008 23:25:41 +0000
parents 9896f3cb1500
children 999b818c33cc
files acelp_filters.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/acelp_filters.c	Thu Aug 21 23:23:01 2008 +0000
+++ b/acelp_filters.c	Thu Aug 21 23:25:41 2008 +0000
@@ -24,8 +24,6 @@
 
 #include "avcodec.h"
 #include "acelp_filters.h"
-#define FRAC_BITS 13
-#include "mathops.h"
 
 const int16_t ff_acelp_interp_filter[61] =
 { /* (0.15) */
@@ -152,8 +150,8 @@
 
     for(i=0; i<length; i++)
     {
-        tmp =  MULL(hpf_f[0], 15836);                     /* (14.13) = (13.13) * (1.13) */
-        tmp += MULL(hpf_f[1], -7667);                     /* (13.13) = (13.13) * (0.13) */
+        tmp =  (hpf_f[0]* 15836LL)>>13;                   /* (14.13) = (13.13) * (1.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) */
 
         out[i] = av_clip_int16((tmp + 0x800) >> 12);      /* (15.0) = 2 * (13.13) = (14.13) */