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

VP8: Fix out of range index for mvcost.

Browse Source 
Clamp index between 0 and MVvals.

Bit exact for speed -8, -6 and -4 on RTC set.

BUG=b/72510002

Change-Id: I61bdb02a0924e157b3c1980f74fbbfe5ce51bc44
This commit is contained in:
Jerome Jiang 2018-02-21 15:28:54 -08:00
parent 2640f25072
commit ca28740570
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vp8/encoder/mcomp.c
View File

@ -34,19 +34,22 @@ int vp8_mv_bit_cost(int_mv *mv, int_mv *ref, int *mvcost[2], int Weight) {
* NEAREST for subsequent blocks. The "Weight" parameter allows, to a * NEAREST for subsequent blocks. The "Weight" parameter allows, to a
* limited extent, for some account to be taken of these factors. * limited extent, for some account to be taken of these factors.
*/ */
return ((mvcost[0][(mv->as_mv.row - ref->as_mv.row) >> 1] + const int mv_idx_row =
mvcost[1][(mv->as_mv.col - ref->as_mv.col) >> 1]) * clamp((mv->as_mv.row - ref->as_mv.row) >> 1, 0, MVvals);
Weight) >> const int mv_idx_col =
7; clamp((mv->as_mv.col - ref->as_mv.col) >> 1, 0, MVvals);
return ((mvcost[0][mv_idx_row] + mvcost[1][mv_idx_col]) * Weight) >> 7;
} }
static int mv_err_cost(int_mv *mv, int_mv *ref, int *mvcost[2], static int mv_err_cost(int_mv *mv, int_mv *ref, int *mvcost[2],
int error_per_bit) { int error_per_bit) {
/* Ignore mv costing if mvcost is NULL */ /* Ignore mv costing if mvcost is NULL */
if (mvcost) { if (mvcost) {
return ((mvcost[0][(mv->as_mv.row - ref->as_mv.row) >> 1] + const int mv_idx_row =
mvcost[1][(mv->as_mv.col - ref->as_mv.col) >> 1]) * clamp((mv->as_mv.row - ref->as_mv.row) >> 1, 0, MVvals);
error_per_bit + const int mv_idx_col =
clamp((mv->as_mv.col - ref->as_mv.col) >> 1, 0, MVvals);
return ((mvcost[0][mv_idx_row] + mvcost[1][mv_idx_col]) * error_per_bit +
128) >> 128) >>
8; 8;
} }