Make "FAST" fully adapted into libaom
1. Renamed "README.libvpx" to "README.libaom"
2. prefixed global functions with aom_
3. Updated README.libaom
BUG=aomedia:1540
Change-Id: Ib85de5fe638128565c74077a9cd853d0397bf0fa
diff --git a/av1/encoder/corner_detect.c b/av1/encoder/corner_detect.c
index f9a8b7b..597bb30 100644
--- a/av1/encoder/corner_detect.c
+++ b/av1/encoder/corner_detect.c
@@ -24,8 +24,8 @@
int av1_fast_corner_detect(unsigned char *buf, int width, int height,
int stride, int *points, int max_points) {
int num_points;
- xy *const frm_corners_xy = fast9_detect_nonmax(buf, width, height, stride,
- FAST_BARRIER, &num_points);
+ xy *const frm_corners_xy = aom_fast9_detect_nonmax(buf, width, height, stride,
+ FAST_BARRIER, &num_points);
num_points = (num_points <= max_points ? num_points : max_points);
if (num_points > 0 && frm_corners_xy) {
memcpy(points, frm_corners_xy, sizeof(*frm_corners_xy) * num_points);
diff --git a/third_party/fastfeat/README.libvpx b/third_party/fastfeat/README.libaom
similarity index 96%
rename from third_party/fastfeat/README.libvpx
rename to third_party/fastfeat/README.libaom
index 1e58a30..a732b0d 100644
--- a/third_party/fastfeat/README.libvpx
+++ b/third_party/fastfeat/README.libaom
@@ -37,3 +37,4 @@
Add lines to turn off clang formatting for these files
Remove Fast 10, 11 and 12
Convert tabs to spaces
+Prefix global functions with "aom_"
diff --git a/third_party/fastfeat/fast.c b/third_party/fastfeat/fast.c
index 0d7efc1..f29ac8f 100644
--- a/third_party/fastfeat/fast.c
+++ b/third_party/fastfeat/fast.c
@@ -3,16 +3,16 @@
#include "fast.h"
-xy* fast9_detect_nonmax(const byte* im, int xsize, int ysize, int stride, int b, int* ret_num_corners)
+xy* aom_fast9_detect_nonmax(const byte* im, int xsize, int ysize, int stride, int b, int* ret_num_corners)
{
xy* corners;
int num_corners;
int* scores;
xy* nonmax;
- corners = fast9_detect(im, xsize, ysize, stride, b, &num_corners);
- scores = fast9_score(im, stride, corners, num_corners, b);
- nonmax = nonmax_suppression(corners, scores, num_corners, ret_num_corners);
+ corners = aom_fast9_detect(im, xsize, ysize, stride, b, &num_corners);
+ scores = aom_fast9_score(im, stride, corners, num_corners, b);
+ nonmax = aom_nonmax_suppression(corners, scores, num_corners, ret_num_corners);
free(corners);
free(scores);
diff --git a/third_party/fastfeat/fast.h b/third_party/fastfeat/fast.h
index a00730e..a65d5a5 100644
--- a/third_party/fastfeat/fast.h
+++ b/third_party/fastfeat/fast.h
@@ -5,15 +5,15 @@
typedef struct { int x, y; } xy;
typedef unsigned char byte;
-int fast9_corner_score(const byte* p, const int pixel[], int bstart);
+int aom_fast9_corner_score(const byte* p, const int pixel[], int bstart);
-xy* fast9_detect(const byte* im, int xsize, int ysize, int stride, int b, int* ret_num_corners);
+xy* aom_fast9_detect(const byte* im, int xsize, int ysize, int stride, int b, int* ret_num_corners);
-int* fast9_score(const byte* i, int stride, xy* corners, int num_corners, int b);
+int* aom_fast9_score(const byte* i, int stride, xy* corners, int num_corners, int b);
-xy* fast9_detect_nonmax(const byte* im, int xsize, int ysize, int stride, int b, int* ret_num_corners);
+xy* aom_fast9_detect_nonmax(const byte* im, int xsize, int ysize, int stride, int b, int* ret_num_corners);
-xy* nonmax_suppression(const xy* corners, const int* scores, int num_corners, int* ret_num_nonmax);
+xy* aom_nonmax_suppression(const xy* corners, const int* scores, int num_corners, int* ret_num_nonmax);
#endif
diff --git a/third_party/fastfeat/fast_9.c b/third_party/fastfeat/fast_9.c
index ec167a9..61c654c 100644
--- a/third_party/fastfeat/fast_9.c
+++ b/third_party/fastfeat/fast_9.c
@@ -5,7 +5,7 @@
typedef struct { int x, y; } xy;
typedef unsigned char byte;
-int fast9_corner_score(const byte* p, const int pixel[], int bstart)
+int aom_fast9_corner_score(const byte* p, const int pixel[], int bstart)
{
int bmin = bstart;
int bmax = 255;
@@ -2958,7 +2958,7 @@
-int* fast9_score(const byte* i, int stride, xy* corners, int num_corners, int b)
+int* aom_fast9_score(const byte* i, int stride, xy* corners, int num_corners, int b)
{
int* scores = (int*)malloc(sizeof(int)* num_corners);
int n;
@@ -2967,13 +2967,13 @@
make_offsets(pixel, stride);
for(n=0; n < num_corners; n++)
- scores[n] = fast9_corner_score(i + corners[n].y*stride + corners[n].x, pixel, b);
+ scores[n] = aom_fast9_corner_score(i + corners[n].y*stride + corners[n].x, pixel, b);
return scores;
}
-xy* fast9_detect(const byte* im, int xsize, int ysize, int stride, int b, int* ret_num_corners)
+xy* aom_fast9_detect(const byte* im, int xsize, int ysize, int stride, int b, int* ret_num_corners)
{
int num_corners=0;
xy* ret_corners;
diff --git a/third_party/fastfeat/nonmax.c b/third_party/fastfeat/nonmax.c
index 0438c4d..0dbc660 100644
--- a/third_party/fastfeat/nonmax.c
+++ b/third_party/fastfeat/nonmax.c
@@ -5,7 +5,7 @@
#define Compare(X, Y) ((X)>=(Y))
-xy* nonmax_suppression(const xy* corners, const int* scores, int num_corners, int* ret_num_nonmax)
+xy* aom_nonmax_suppression(const xy* corners, const int* scores, int num_corners, int* ret_num_nonmax)
{
int num_nonmax=0;
int last_row;
