Commit 0e175633 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Removing is_intra_mode() function."

parents 25a2740a aa76cd1e
...@@ -74,10 +74,6 @@ typedef enum { ...@@ -74,10 +74,6 @@ typedef enum {
MB_MODE_COUNT MB_MODE_COUNT
} MB_PREDICTION_MODE; } MB_PREDICTION_MODE;
static INLINE int is_intra_mode(MB_PREDICTION_MODE mode) {
return mode <= TM_PRED;
}
static INLINE int is_inter_mode(MB_PREDICTION_MODE mode) { static INLINE int is_inter_mode(MB_PREDICTION_MODE mode) {
return mode >= NEARESTMV && mode <= NEWMV; return mode >= NEARESTMV && mode <= NEWMV;
} }
......
...@@ -3537,16 +3537,14 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -3537,16 +3537,14 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
} }
// Keep record of best intra rd // Keep record of best intra rd
if (xd->mi_8x8[0]->mbmi.ref_frame[0] == INTRA_FRAME && if (!is_inter_block(&xd->mi_8x8[0]->mbmi) &&
is_intra_mode(xd->mi_8x8[0]->mbmi.mode) &&
this_rd < best_intra_rd) { this_rd < best_intra_rd) {
best_intra_rd = this_rd; best_intra_rd = this_rd;
best_intra_mode = xd->mi_8x8[0]->mbmi.mode; best_intra_mode = xd->mi_8x8[0]->mbmi.mode;
} }
// Keep record of best inter rd with single reference // Keep record of best inter rd with single reference
if (xd->mi_8x8[0]->mbmi.ref_frame[0] > INTRA_FRAME && if (is_inter_block(&xd->mi_8x8[0]->mbmi) && !mode_excluded &&
xd->mi_8x8[0]->mbmi.ref_frame[1] == NONE &&
!mode_excluded &&
this_rd < best_inter_rd) { this_rd < best_inter_rd) {
best_inter_rd = this_rd; best_inter_rd = this_rd;
best_inter_ref_frame = ref_frame; best_inter_ref_frame = ref_frame;
......
Markdown is supported
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