shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove a duplicate block_size variable."

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

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

@@ -3129,7 +3129,6 @@

   MACROBLOCKD *const xd = &x->e_mbd;

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

   const struct segmentation *const seg = &cm->seg;

-  const BLOCK_SIZE block_size = get_plane_block_size(bsize, &xd->plane[0]);

   MB_PREDICTION_MODE this_mode;

   MV_REFERENCE_FRAME ref_frame, second_ref_frame;

   unsigned char segment_id = mbmi->segment_id;

@@ -3195,7 +3194,7 @@

     x->pred_mv_sad[ref_frame] = INT_MAX;

     if (cpi->ref_frame_flags & flag_list[ref_frame]) {

       vp9_setup_buffer_inter(cpi, x, tile,

-                             ref_frame, block_size, mi_row, mi_col,

+                             ref_frame, bsize, mi_row, mi_col,

                              frame_mv[NEARESTMV], frame_mv[NEARMV], yv12_mb);

     }

     frame_mv[NEWMV][ref_frame].as_int = INVALID_MV;

@@ -3762,7 +3761,6 @@

   MACROBLOCKD *xd = &x->e_mbd;

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

   const struct segmentation *seg = &cm->seg;

-  const BLOCK_SIZE block_size = get_plane_block_size(bsize, &xd->plane[0]);

   MV_REFERENCE_FRAME ref_frame, second_ref_frame;

   unsigned char segment_id = mbmi->segment_id;

   int comp_pred, i;

@@ -3822,7 +3820,7 @@

   for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ref_frame++) {

     if (cpi->ref_frame_flags & flag_list[ref_frame]) {

       vp9_setup_buffer_inter(cpi, x, tile,

-                             ref_frame, block_size, mi_row, mi_col,

+                             ref_frame, bsize, mi_row, mi_col,

                              frame_mv[NEARESTMV], frame_mv[NEARMV],

                              yv12_mb);

     }