shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I1b972c94,I9c897d32

* changes:
  Prevent invalid memory access
  Use correct bsize for uv

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

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

@@ -595,9 +595,16 @@

     for (i = 1; i <= 2; ++i) {

       struct macroblock_plane  *p = &x->plane[i];

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

+#if GLOBAL_MOTION

+      const BLOCK_SIZE bs = get_plane_block_size(bsize, pd);

+#else

       const BLOCK_SIZE bs = get_plane_block_size(BLOCK_64X64, pd);

-      uv_sad = cpi->fn_ptr[bs].sdf(p->src.buf, p->src.stride,

-                                   pd->dst.buf, pd->dst.stride);

+#endif

+      if (bs == BLOCK_INVALID)

+        uv_sad = INT_MAX;

+      else

+        uv_sad = cpi->fn_ptr[bs].sdf(p->src.buf, p->src.stride,

+                                     pd->dst.buf, pd->dst.stride);

 #if GLOBAL_MOTION

       x->color_sensitivity[i - 1] = uv_sad * 4 > y_sad;