stagefright: move math templates into AUtils.h

add unit test for math templates

Bug: 17676461
Change-Id: Ie964c5fcfcca1ec53b4538f8e577392e8fbb4319

1 files changed, 1 insertions, 30 deletions

diff --git a/media/libmediaplayerservice/VideoFrameScheduler.cpp b/media/libmediaplayerservice/VideoFrameScheduler.cpp
index 1a5f3e0..ce5f5fe 100644
--- a/media/libmediaplayerservice/VideoFrameScheduler.cpp
+++ b/media/libmediaplayerservice/VideoFrameScheduler.cpp
@@ -27,6 +27,7 @@
 #include <ui/DisplayStatInfo.h>
 
 #include <media/stagefright/foundation/ADebug.h>
+#include <media/stagefright/foundation/AUtils.h>
 
 #include "VideoFrameScheduler.h"
 
@@ -35,36 +36,6 @@ namespace android {
 static const nsecs_t kNanosIn1s = 1000000000;
 
 template<class T>
-inline static const T divRound(const T &nom, const T &den) {
-    if ((nom >= 0) ^ (den >= 0)) {
-        return (nom - den / 2) / den;
-    } else {
-        return (nom + den / 2) / den;
-    }
-}
-
-template<class T>
-inline static T abs(const T &a) {
-    return a < 0 ? -a : a;
-}
-
-template<class T>
-inline static const T &min(const T &a, const T &b) {
-    return a < b ? a : b;
-}
-
-template<class T>
-inline static const T &max(const T &a, const T &b) {
-    return a > b ? a : b;
-}
-
-template<class T>
-inline static T periodicError(const T &val, const T &period) {
-    T err = abs(val) % period;
-    return (err < (period / 2)) ? err : (period - err);
-}
-
-template<class T>
 static int compare(const T *lhs, const T *rhs) {
     if (*lhs < *rhs) {
         return -1;