shithub: libvpx

Info  •  Files  •  Log  •  Branches

Remove redundant num_refs definition

Use is_comp_pred to replace the use case of num_refs.

Change-Id: I4d0c1e14d5f728428a2ae3d293cd2b4a8b2f31d8

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

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

@@ -2024,7 +2024,6 @@

   MACROBLOCKD *xd = &x->e_mbd;

   MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;

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

   int i;

@@ -2091,7 +2090,7 @@

     }

   }

-  for (i = 0; i < num_refs; ++i) {

+  for (i = 0; i < is_comp_pred + 1; ++i) {

     cur_mv[i] = frame_mv[refs[i]];

     // Clip "next_nearest" so that it does not extend to far out of image

     if (this_mode != NEWMV)

-- 

⑨