shithub: libvpx

Download patch

ref: c86b18894e22042e9c4e670a5a12b00a65d2c2e6
parent: 60198a595d53b34139c3e7e6c9d8f7d4ab69db7c
parent: 0f02dc2709eb882703d8c9be57e20907b47f9f74
author: Yaowu Xu <yaowu@google.com>
date: Wed Jul 3 09:21:22 EDT 2013 

Merge "Inline a few intra predictors"


--- a/vp9/common/vp9_reconintra.c
+++ b/vp9/common/vp9_reconintra.c
@@ -34,9 +34,9 @@
 };
 
 
-static void d27_predictor(uint8_t *ypred_ptr, int y_stride,
-                          int bw, int bh,
-                          uint8_t *yabove_row, uint8_t *yleft_col) {
+static INLINE void d27_predictor(uint8_t *ypred_ptr, int y_stride,
+                                 int bw, int bh,
+                                 uint8_t *yabove_row, uint8_t *yleft_col) {
   int r, c;
   // first column
   for (r = 0; r < bh - 1; ++r) {
@@ -69,7 +69,7 @@
   }
 }
 
-static void d63_predictor(uint8_t *ypred_ptr, int y_stride,
+static INLINE void d63_predictor(uint8_t *ypred_ptr, int y_stride,
                           int bw, int bh,
                           uint8_t *yabove_row, uint8_t *yleft_col) {
   int r, c;
@@ -88,9 +88,9 @@
   }
 }
 
-static void d45_predictor(uint8_t *ypred_ptr, int y_stride,
-                          int bw, int bh,
-                          uint8_t *yabove_row, uint8_t *yleft_col) {
+static INLINE void d45_predictor(uint8_t *ypred_ptr, int y_stride,
+                                 int bw, int bh,
+                                 uint8_t *yabove_row, uint8_t *yleft_col) {
   int r, c;
   for (r = 0; r < bh; ++r) {
     for (c = 0; c < bw; ++c) {
@@ -105,7 +105,7 @@
   }
 }
 
-static void d117_predictor(uint8_t *ypred_ptr, int y_stride,
+static INLINE void d117_predictor(uint8_t *ypred_ptr, int y_stride,
                            int bw, int bh,
                            uint8_t *yabove_row, uint8_t *yleft_col) {
   int r, c;
@@ -141,9 +141,9 @@
 }
 
 
-static void d135_predictor(uint8_t *ypred_ptr, int y_stride,
-                           int bw, int bh,
-                           uint8_t *yabove_row, uint8_t *yleft_col) {
+static INLINE void d135_predictor(uint8_t *ypred_ptr, int y_stride,
+                                  int bw, int bh,
+                                  uint8_t *yabove_row, uint8_t *yleft_col) {
   int r, c;
   ypred_ptr[0] = ROUND_POWER_OF_TWO(yleft_col[0] +
                                     yabove_row[-1] * 2 +
@@ -169,11 +169,11 @@
   }
 }
 
-static void d153_predictor(uint8_t *ypred_ptr,
-                           int y_stride,
-                           int bw, int bh,
-                           uint8_t *yabove_row,
-                           uint8_t *yleft_col) {
+static INLINE void d153_predictor(uint8_t *ypred_ptr,
+                                  int y_stride,
+                                  int bw, int bh,
+                                  uint8_t *yabove_row,
+                                  uint8_t *yleft_col) {
   int r, c;
   ypred_ptr[0] = ROUND_POWER_OF_TWO(yabove_row[-1] + yleft_col[0], 1);
   for (r = 1; r < bh; r++)
-- 
⑨