Skip to content
GitLab
Commit c86b1889 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Inline a few intra predictors"

parents 60198a59 0f02dc27
v1.14.0-linphone 1.4.X experimental feature/update_to_v1.9.0-linphone feature/uwp_nuget forest frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m31-baseline m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck mcw mcw2 nextgen nextgenv2 pcs-2013 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/debargha/playground sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom stable-vp9-decoder v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0 v1.3.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 16 deletions
vp9/common/vp9_reconintra.c
+ 16
− 16
View file @ c86b1889
...@@ -34,9 +34,9 @@ const TX_TYPE mode2txfm_map[MB_MODE_COUNT] = { ...@@ -34,9 +34,9 @@ const TX_TYPE mode2txfm_map[MB_MODE_COUNT] = {
}; };
static void d27_predictor(uint8_t *ypred_ptr, int y_stride, static INLINE void d27_predictor(uint8_t *ypred_ptr, int y_stride,
int bw, int bh, int bw, int bh,
uint8_t *yabove_row, uint8_t *yleft_col) { uint8_t *yabove_row, uint8_t *yleft_col) {
int r, c; int r, c;
// first column // first column
for (r = 0; r < bh - 1; ++r) { for (r = 0; r < bh - 1; ++r) {
...@@ -69,7 +69,7 @@ static void d27_predictor(uint8_t *ypred_ptr, int y_stride, ...@@ -69,7 +69,7 @@ static void d27_predictor(uint8_t *ypred_ptr, int y_stride,
} }
} }
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, int bw, int bh,
uint8_t *yabove_row, uint8_t *yleft_col) { uint8_t *yabove_row, uint8_t *yleft_col) {
int r, c; int r, c;
...@@ -88,9 +88,9 @@ static void d63_predictor(uint8_t *ypred_ptr, int y_stride, ...@@ -88,9 +88,9 @@ static void d63_predictor(uint8_t *ypred_ptr, int y_stride,
} }
} }
static void d45_predictor(uint8_t *ypred_ptr, int y_stride, static INLINE void d45_predictor(uint8_t *ypred_ptr, int y_stride,
int bw, int bh, int bw, int bh,
uint8_t *yabove_row, uint8_t *yleft_col) { uint8_t *yabove_row, uint8_t *yleft_col) {
int r, c; int r, c;
for (r = 0; r < bh; ++r) { for (r = 0; r < bh; ++r) {
for (c = 0; c < bw; ++c) { for (c = 0; c < bw; ++c) {
...@@ -105,7 +105,7 @@ static void d45_predictor(uint8_t *ypred_ptr, int y_stride, ...@@ -105,7 +105,7 @@ static void d45_predictor(uint8_t *ypred_ptr, int y_stride,
} }
} }
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, int bw, int bh,
uint8_t *yabove_row, uint8_t *yleft_col) { uint8_t *yabove_row, uint8_t *yleft_col) {
int r, c; int r, c;
...@@ -141,9 +141,9 @@ static void d117_predictor(uint8_t *ypred_ptr, int y_stride, ...@@ -141,9 +141,9 @@ static void d117_predictor(uint8_t *ypred_ptr, int y_stride,
} }
static void d135_predictor(uint8_t *ypred_ptr, int y_stride, static INLINE void d135_predictor(uint8_t *ypred_ptr, int y_stride,
int bw, int bh, int bw, int bh,
uint8_t *yabove_row, uint8_t *yleft_col) { uint8_t *yabove_row, uint8_t *yleft_col) {
int r, c; int r, c;
ypred_ptr[0] = ROUND_POWER_OF_TWO(yleft_col[0] + ypred_ptr[0] = ROUND_POWER_OF_TWO(yleft_col[0] +
yabove_row[-1] * 2 + yabove_row[-1] * 2 +
...@@ -169,11 +169,11 @@ static void d135_predictor(uint8_t *ypred_ptr, int y_stride, ...@@ -169,11 +169,11 @@ static void d135_predictor(uint8_t *ypred_ptr, int y_stride,
} }
} }
static void d153_predictor(uint8_t *ypred_ptr, static INLINE void d153_predictor(uint8_t *ypred_ptr,
int y_stride, int y_stride,
int bw, int bh, int bw, int bh,
uint8_t *yabove_row, uint8_t *yabove_row,
uint8_t *yleft_col) { uint8_t *yleft_col) {
int r, c; int r, c;
ypred_ptr[0] = ROUND_POWER_OF_TWO(yabove_row[-1] + yleft_col[0], 1); ypred_ptr[0] = ROUND_POWER_OF_TWO(yabove_row[-1] + yleft_col[0], 1);
for (r = 1; r < bh; r++) for (r = 1; r < bh; r++)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment