Index: source/libvpx/vp8/encoder/rdopt.h |
diff --git a/source/libvpx/vp8/encoder/rdopt.h b/source/libvpx/vp8/encoder/rdopt.h |
index b4fcd10b61e41f75bcf7ff2a305f1edc64ac07dd..1cb1a07266a862b615d4a7e818880d2f42193ac9 100644 |
--- a/source/libvpx/vp8/encoder/rdopt.h |
+++ b/source/libvpx/vp8/encoder/rdopt.h |
@@ -12,13 +12,15 @@ |
#ifndef VP8_ENCODER_RDOPT_H_ |
#define VP8_ENCODER_RDOPT_H_ |
+#include "./vpx_config.h" |
+ |
#ifdef __cplusplus |
extern "C" { |
#endif |
#define RDCOST(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) ) |
-static void insertsortmv(int arr[], int len) |
+static INLINE void insertsortmv(int arr[], int len) |
{ |
int i, j, k; |
@@ -41,7 +43,7 @@ static void insertsortmv(int arr[], int len) |
} |
} |
-static void insertsortsad(int arr[],int idx[], int len) |
+static INLINE void insertsortsad(int arr[],int idx[], int len) |
{ |
int i, j, k; |
@@ -77,10 +79,10 @@ extern void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, |
extern void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate); |
-static void get_plane_pointers(const YV12_BUFFER_CONFIG *fb, |
- unsigned char *plane[3], |
- unsigned int recon_yoffset, |
- unsigned int recon_uvoffset) |
+static INLINE void get_plane_pointers(const YV12_BUFFER_CONFIG *fb, |
+ unsigned char *plane[3], |
+ unsigned int recon_yoffset, |
+ unsigned int recon_uvoffset) |
{ |
plane[0] = fb->y_buffer + recon_yoffset; |
plane[1] = fb->u_buffer + recon_uvoffset; |
@@ -88,10 +90,10 @@ static void get_plane_pointers(const YV12_BUFFER_CONFIG *fb, |
} |
-static void get_predictor_pointers(const VP8_COMP *cpi, |
- unsigned char *plane[4][3], |
- unsigned int recon_yoffset, |
- unsigned int recon_uvoffset) |
+static INLINE void get_predictor_pointers(const VP8_COMP *cpi, |
+ unsigned char *plane[4][3], |
+ unsigned int recon_yoffset, |
+ unsigned int recon_uvoffset) |
{ |
if (cpi->ref_frame_flags & VP8_LAST_FRAME) |
get_plane_pointers(&cpi->common.yv12_fb[cpi->common.lst_fb_idx], |
@@ -107,8 +109,8 @@ static void get_predictor_pointers(const VP8_COMP *cpi, |
} |
-static void get_reference_search_order(const VP8_COMP *cpi, |
- int ref_frame_map[4]) |
+static INLINE void get_reference_search_order(const VP8_COMP *cpi, |
+ int ref_frame_map[4]) |
{ |
int i=0; |