shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "VP9 firstpass: Bugfix when mi_col_start/end is odd"

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -820,6 +820,8 @@

   VP9_COMMON *const cm = &cpi->common;

   MACROBLOCKD *const xd = &x->e_mbd;

   TileInfo tile = tile_data->tile_info;

+  const int mb_col_start = ROUND_POWER_OF_TWO(tile.mi_col_start, 1);

+  const int mb_col_end = ROUND_POWER_OF_TWO(tile.mi_col_end, 1);

   struct macroblock_plane *const p = x->plane;

   struct macroblockd_plane *const pd = xd->plane;

   const PICK_MODE_CONTEXT *ctx = &td->pc_root->none;

@@ -846,9 +848,8 @@

   assert(new_yv12 != NULL);

   assert(frame_is_intra_only(cm) || (lst_yv12 != NULL));

-  xd->mi = cm->mi_grid_visible + xd->mi_stride * (mb_row << 1) +

-           (tile.mi_col_start >> 1);

-  xd->mi[0] = cm->mi + xd->mi_stride * (mb_row << 1) + (tile.mi_col_start >> 1);

+  xd->mi = cm->mi_grid_visible + xd->mi_stride * (mb_row << 1) + mb_col_start;

+  xd->mi[0] = cm->mi + xd->mi_stride * (mb_row << 1) + mb_col_start;

   for (i = 0; i < MAX_MB_PLANE; ++i) {

     p[i].coeff = ctx->coeff_pbuf[i][1];

@@ -862,10 +863,9 @@

   uv_mb_height = 16 >> (new_yv12->y_height > new_yv12->uv_height);

   // Reset above block coeffs.

-  recon_yoffset =

-      (mb_row * recon_y_stride * 16) + (tile.mi_col_start >> 1) * 16;

-  recon_uvoffset = (mb_row * recon_uv_stride * uv_mb_height) +

-                   (tile.mi_col_start >> 1) * uv_mb_height;

+  recon_yoffset = (mb_row * recon_y_stride * 16) + mb_col_start * 16;

+  recon_uvoffset =

+      (mb_row * recon_uv_stride * uv_mb_height) + mb_col_start * uv_mb_height;

   // Set up limit values for motion vectors to prevent them extending

   // outside the UMV borders.

@@ -873,8 +873,7 @@

   x->mv_limits.row_max =

       ((cm->mb_rows - 1 - mb_row) * 16) + BORDER_MV_PIXELS_B16;

-  for (mb_col = tile.mi_col_start >> 1, c = 0; mb_col < (tile.mi_col_end >> 1);

-       ++mb_col, c++) {

+  for (mb_col = mb_col_start, c = 0; mb_col < mb_col_end; ++mb_col, c++) {

     int this_error;

     int this_intra_error;

     const int use_dc_pred = (mb_col || mb_row) && (!mb_col || !mb_row);

@@ -920,7 +919,7 @@

     x->skip_encode = 0;

     x->fp_src_pred = 0;

     // Do intra prediction based on source pixels for tile boundaries

-    if ((mb_col == (tile.mi_col_start >> 1)) && mb_col != 0) {

+    if (mb_col == mb_col_start && mb_col != 0) {

       xd->left_mi = &mi_left;

       x->fp_src_pred = 1;

     }

@@ -1310,7 +1309,7 @@

     recon_uvoffset += uv_mb_height;

     // Accumulate row level stats to the corresponding tile stats

-    if (cpi->row_mt && mb_col == (tile.mi_col_end >> 1) - 1)

+    if (cpi->row_mt && mb_col == mb_col_end - 1)

       accumulate_fp_mb_row_stat(tile_data, fp_acc_data);

     (*(cpi->row_mt_sync_write_ptr))(&tile_data->row_mt_sync, mb_row, c,