generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes I1b972c94,I9c897d32

Browse Source 
* changes:
  Prevent invalid memory access
  Use correct bsize for uv
This commit is contained in:
Yaowu Xu 2015-03-06 07:27:58 -08:00 committed by Gerrit Code Review
commit 0f37601fd7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vp9/encoder/vp9_encodeframe.c
View File

@ -595,9 +595,16 @@ static void choose_partitioning(VP9_COMP *cpi,
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;