Skip to content
GitLab
Commit 2344e3a2 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Converting CHECK_POINT macro to inline function."

parents 6e8c1036 513666e7
v1.14.0-linphone 1.4.X feature/update_to_v1.9.0-linphone feature/uwp_nuget frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck mcw mcw2 nextgen nextgenv2 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench 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 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
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 13 deletions
vp9/encoder/vp9_mcomp.c
+ 16
− 13
View file @ 2344e3a2
...@@ -464,20 +464,20 @@ int vp9_find_best_sub_pixel_comp_tree(MACROBLOCK *x, ...@@ -464,20 +464,20 @@ int vp9_find_best_sub_pixel_comp_tree(MACROBLOCK *x,
#undef CHECK_BETTER #undef CHECK_BETTER
#undef SP #undef SP
static INLINE int check_bounds(MACROBLOCK *x, int row, int col, int range) { static INLINE int check_bounds(const MACROBLOCK *x, int row, int col,
int range) {
return ((row - range) >= x->mv_row_min) & return ((row - range) >= x->mv_row_min) &
((row + range) <= x->mv_row_max) & ((row + range) <= x->mv_row_max) &
((col - range) >= x->mv_col_min) & ((col - range) >= x->mv_col_min) &
((col + range) <= x->mv_col_max); ((col + range) <= x->mv_col_max);
} }
#define CHECK_POINT \ static INLINE int check_point(const MACROBLOCK *x, const MV *mv) {
{\ return (mv->col < x->mv_col_min) |
if (this_mv.col < x->mv_col_min) continue;\ (mv->col > x->mv_col_max) |
if (this_mv.col > x->mv_col_max) continue;\ (mv->row < x->mv_row_min) |
if (this_mv.row < x->mv_row_min) continue;\ (mv->row > x->mv_row_max);
if (this_mv.row > x->mv_row_max) continue;\ }
}
#define CHECK_BETTER \ #define CHECK_BETTER \
{\ {\
...@@ -580,7 +580,8 @@ static int vp9_pattern_search(MACROBLOCK *x, ...@@ -580,7 +580,8 @@ static int vp9_pattern_search(MACROBLOCK *x,
for (i = 0; i < num_candidates[t]; i++) { for (i = 0; i < num_candidates[t]; i++) {
this_mv.row = br + candidates[t][i].row; this_mv.row = br + candidates[t][i].row;
this_mv.col = bc + candidates[t][i].col; this_mv.col = bc + candidates[t][i].col;
CHECK_POINT if (check_point(x, &this_mv))
continue;
this_offset = base_offset + (this_mv.row * in_what_stride) + this_offset = base_offset + (this_mv.row * in_what_stride) +
this_mv.col; this_mv.col;
thissad = vfp->sdf(what, what_stride, this_offset, in_what_stride, thissad = vfp->sdf(what, what_stride, this_offset, in_what_stride,
...@@ -623,7 +624,8 @@ static int vp9_pattern_search(MACROBLOCK *x, ...@@ -623,7 +624,8 @@ static int vp9_pattern_search(MACROBLOCK *x,
for (i = 0; i < num_candidates[s]; i++) { for (i = 0; i < num_candidates[s]; i++) {
this_mv.row = br + candidates[s][i].row; this_mv.row = br + candidates[s][i].row;
this_mv.col = bc + candidates[s][i].col; this_mv.col = bc + candidates[s][i].col;
CHECK_POINT if (check_point(x, &this_mv))
continue;
this_offset = base_offset + (this_mv.row * in_what_stride) + this_offset = base_offset + (this_mv.row * in_what_stride) +
this_mv.col; this_mv.col;
thissad = vfp->sdf(what, what_stride, this_offset, in_what_stride, thissad = vfp->sdf(what, what_stride, this_offset, in_what_stride,
...@@ -659,7 +661,8 @@ static int vp9_pattern_search(MACROBLOCK *x, ...@@ -659,7 +661,8 @@ static int vp9_pattern_search(MACROBLOCK *x,
for (i = 0; i < PATTERN_CANDIDATES_REF; i++) { for (i = 0; i < PATTERN_CANDIDATES_REF; i++) {
this_mv.row = br + candidates[s][next_chkpts_indices[i]].row; this_mv.row = br + candidates[s][next_chkpts_indices[i]].row;
this_mv.col = bc + candidates[s][next_chkpts_indices[i]].col; this_mv.col = bc + candidates[s][next_chkpts_indices[i]].col;
CHECK_POINT if (check_point(x, &this_mv))
continue;
this_offset = base_offset + (this_mv.row * (in_what_stride)) + this_offset = base_offset + (this_mv.row * (in_what_stride)) +
this_mv.col; this_mv.col;
thissad = vfp->sdf(what, what_stride, this_offset, in_what_stride, thissad = vfp->sdf(what, what_stride, this_offset, in_what_stride,
...@@ -699,7 +702,8 @@ static int vp9_pattern_search(MACROBLOCK *x, ...@@ -699,7 +702,8 @@ static int vp9_pattern_search(MACROBLOCK *x,
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
this_mv.row = br + neighbors[i].row; this_mv.row = br + neighbors[i].row;
this_mv.col = bc + neighbors[i].col; this_mv.col = bc + neighbors[i].col;
CHECK_POINT if (check_point(x, &this_mv))
continue;
this_offset = base_offset + (this_mv.row * (in_what_stride)) + this_offset = base_offset + (this_mv.row * (in_what_stride)) +
this_mv.col; this_mv.col;
thissad = vfp->sdf(what, what_stride, this_offset, in_what_stride, thissad = vfp->sdf(what, what_stride, this_offset, in_what_stride,
...@@ -852,7 +856,6 @@ int vp9_square_search(MACROBLOCK *x, ...@@ -852,7 +856,6 @@ int vp9_square_search(MACROBLOCK *x,
square_num_candidates, square_candidates); square_num_candidates, square_candidates);
}; };
#undef CHECK_POINT
#undef CHECK_BETTER #undef CHECK_BETTER
int vp9_full_range_search_c(MACROBLOCK *x, MV *ref_mv, MV *best_mv, int vp9_full_range_search_c(MACROBLOCK *x, MV *ref_mv, MV *best_mv,
......
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