shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removing is_intra_mode() function."

--- a/vp9/common/vp9_blockd.h

+++ b/vp9/common/vp9_blockd.h

@@ -74,10 +74,6 @@

   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;

 }

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -3537,16 +3537,14 @@

     }

     // 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;