shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Using is_inter_block and has_second_ref functions."

--- a/vp9/common/vp9_findnearmv.h

+++ b/vp9/common/vp9_findnearmv.h

@@ -55,13 +55,11 @@

     if (!mi)

       return DC_PRED;

-    if (mi->mbmi.ref_frame[0] != INTRA_FRAME) {

+    if (is_inter_block(&mi->mbmi))

       return DC_PRED;

-    } else if (mi->mbmi.sb_type < BLOCK_8X8) {

-      return ((mi->bmi + 1 + b)->as_mode);

-    } else {

-      return mi->mbmi.mode;

-    }

+    else

+      return mi->mbmi.sb_type < BLOCK_8X8 ? (mi->bmi + 1 + b)->as_mode

+                                          : mi->mbmi.mode;

   }

   assert(b == 1 || b == 3);

   return (mi->bmi + b - 1)->as_mode;

@@ -77,13 +75,11 @@

     if (!mi)

       return DC_PRED;

-    if (mi->mbmi.ref_frame[0] != INTRA_FRAME) {

+    if (is_inter_block(&mi->mbmi))

       return DC_PRED;

-    } else if (mi->mbmi.sb_type < BLOCK_8X8) {

-      return ((mi->bmi + 2 + b)->as_mode);

-    } else {

-      return mi->mbmi.mode;

-    }

+    else

+      return mi->mbmi.sb_type < BLOCK_8X8 ? (mi->bmi + 2 + b)->as_mode

+                                          : mi->mbmi.mode;

   }

   return (mi->bmi + b - 2)->as_mode;

--- a/vp9/common/vp9_reconinter.c

+++ b/vp9/common/vp9_reconinter.c

@@ -132,7 +132,7 @@

   const int x = 4 * (block & ((1 << bwl) - 1));

   const int y = 4 * (block >> bwl);

   const MODE_INFO *mi = xd->this_mi;

-  const int use_second_ref = mi->mbmi.ref_frame[1] > 0;

+  const int is_compound = has_second_ref(&mi->mbmi);

   int ref;

   assert(x < bw);

@@ -140,7 +140,7 @@

   assert(mi->mbmi.sb_type < BLOCK_8X8 || 4 << pred_w == bw);

   assert(mi->mbmi.sb_type < BLOCK_8X8 || 4 << pred_h == bh);

-  for (ref = 0; ref < 1 + use_second_ref; ++ref) {

+  for (ref = 0; ref < 1 + is_compound; ++ref) {

     struct scale_factors *const scale = &xd->scale_factor[ref];

     struct buf_2d *const pre_buf = &pd->pre[ref];

     struct buf_2d *const dst_buf = &pd->dst;

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -2736,7 +2736,7 @@

     int idx = cm->ref_frame_map[get_ref_frame_idx(cpi, mbmi->ref_frame[0])];

     YV12_BUFFER_CONFIG *ref_fb = &cm->yv12_fb[idx];

     YV12_BUFFER_CONFIG *second_ref_fb = NULL;

-    if (mbmi->ref_frame[1] > 0) {

+    if (has_second_ref(mbmi)) {

       idx = cm->ref_frame_map[get_ref_frame_idx(cpi, mbmi->ref_frame[1])];

       second_ref_fb = &cm->yv12_fb[idx];

     }

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

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

@@ -2653,7 +2653,7 @@

   VP9_COMMON *cm = &cpi->common;

   MACROBLOCKD *xd = &x->e_mbd;

   MB_MODE_INFO *mbmi = &xd->this_mi->mbmi;

-  const int is_comp_pred = (mbmi->ref_frame[1] > 0);

+  const int is_comp_pred = has_second_ref(mbmi);

   const int num_refs = is_comp_pred ? 2 : 1;

   const int this_mode = mbmi->mode;

   int_mv *frame_mv = mode_mv[this_mode];

@@ -4025,13 +4025,11 @@

   if (best_mbmode.ref_frame[0] != INTRA_FRAME &&

       best_mbmode.sb_type < BLOCK_8X8) {

     for (i = 0; i < 4; i++)

-      xd->this_mi->bmi[i].as_mv[0].as_int =

-          best_bmodes[i].as_mv[0].as_int;

+      xd->this_mi->bmi[i].as_mv[0].as_int = best_bmodes[i].as_mv[0].as_int;

-    if (mbmi->ref_frame[1] > 0)

+    if (has_second_ref(mbmi))

       for (i = 0; i < 4; i++)

-        xd->this_mi->bmi[i].as_mv[1].as_int =

-            best_bmodes[i].as_mv[1].as_int;

+        xd->this_mi->bmi[i].as_mv[1].as_int = best_bmodes[i].as_mv[1].as_int;

     *x->partition_info = best_partition;

-- 

⑨