[FFmpeg-cvslog] dca_xll: use av_clip_intp2()

James Almer git at videolan.org
Sat Apr 18 19:20:11 CEST 2015


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Apr 18 03:40:17 2015 -0300| [979b77eec5db6965e3fb5d2a453437264a95cfa1] | committer: James Almer

dca_xll: use av_clip_intp2()

Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=979b77eec5db6965e3fb5d2a453437264a95cfa1
---

 libavcodec/dca_xll.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c
index 9e1085c..98fd4c8 100644
--- a/libavcodec/dca_xll.c
+++ b/libavcodec/dca_xll.c
@@ -393,7 +393,7 @@ static void dca_xll_inv_adapt_pred(int *samples, int nsamples, unsigned order,
             for (; j < order; j++)
                 s += (int64_t) c[j] * prev[DCA_XLL_AORDER_MAX + i - 1 - j];
 
-            samples[i] -= av_clip((s + 0x8000) >> 16, -0x1000000, 0xffffff);
+            samples[i] -= av_clip_intp2((s + 0x8000) >> 16, 24);
         }
     }
     for (i = order; i < nsamples; i++) {
@@ -402,7 +402,7 @@ static void dca_xll_inv_adapt_pred(int *samples, int nsamples, unsigned order,
 
         /* NOTE: Equations seem to imply addition, while the
          * pseudocode seems to use subtraction.*/
-        samples[i] -= av_clip((s + 0x8000) >> 16, -0x1000000, 0xffffff);
+        samples[i] -= av_clip_intp2((s + 0x8000) >> 16, 24);
     }
 }
 



More information about the ffmpeg-cvslog mailing list