From aa76cd1e49feb524bfb7818612c75c95c5439dc5 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Mon, 28 Oct 2013 20:00:55 -0700 Subject: [PATCH] Removing is_intra_mode() function. It is enough to check just block type: intra or inter. Intra block implies intra prediction mode, and inter block implies inter mode. Change-Id: I3cf98731a3935f670a3cd8e2b2443483eb944be4 --- vp9/common/vp9_blockd.h | 4 ---- vp9/encoder/vp9_rdopt.c | 8 +++----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index bac40c5..ff047b8 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -74,10 +74,6 @@ typedef enum { MB_MODE_COUNT } 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) { return mode >= NEARESTMV && mode <= NEWMV; } diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index d25112b..e4be046 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3526,16 +3526,14 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, } // Keep record of best intra rd - if (xd->mi_8x8[0]->mbmi.ref_frame[0] == INTRA_FRAME && - is_intra_mode(xd->mi_8x8[0]->mbmi.mode) && + if (!is_inter_block(&xd->mi_8x8[0]->mbmi) && this_rd < best_intra_rd) { best_intra_rd = this_rd; best_intra_mode = xd->mi_8x8[0]->mbmi.mode; } + // Keep record of best inter rd with single reference - if (xd->mi_8x8[0]->mbmi.ref_frame[0] > INTRA_FRAME && - xd->mi_8x8[0]->mbmi.ref_frame[1] == NONE && - !mode_excluded && + if (is_inter_block(&xd->mi_8x8[0]->mbmi) && !mode_excluded && this_rd < best_inter_rd) { best_inter_rd = this_rd; best_inter_ref_frame = ref_frame; -- 2.7.4