shithub: libvpx

Info  •  Files  •  Log  •  Branches

Revert "Remove dec_build_inter_predictors() parameters"

This reverts commit 9650b9d72aa236e76c54b4f0acebd6bf1d6bbe48.

Change-Id: I841c4a4734170fda63469e32adc10703aa4bf0fa

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

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

@@ -244,6 +244,7 @@

 // TODO(jingning): This function serves as a placeholder for decoder prediction

 // using on demand border extension. It should be moved to /decoder/ directory.

 static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block,

+                                       int bw, int bh,

                                        int x, int y, int w, int h,

                                        int mi_x, int mi_y) {

   struct macroblockd_plane *const pd = &xd->plane[plane];

@@ -377,10 +378,10 @@

       assert(bsize == BLOCK_8X8);

       for (y = 0; y < num_4x4_h; ++y)

         for (x = 0; x < num_4x4_w; ++x)

-          dec_build_inter_predictors(xd, plane, i++,

+          dec_build_inter_predictors(xd, plane, i++, bw, bh,

                                      4 * x, 4 * y, 4, 4, mi_x, mi_y);

     } else {

-      dec_build_inter_predictors(xd, plane, 0,

+      dec_build_inter_predictors(xd, plane, 0, bw, bh,

                                  0, 0, bw, bh, mi_x, mi_y);

     }

   }