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

vp9: Fix consec_zero_mv in skin detection.

Browse Source 
This was missed in https://chromium-review.googlesource.com/#/c/340135/.

Change-Id: Iafc83141f4ff744819bdbde7d239678b215feb9d
This commit is contained in:
Marco 2016-04-25 15:37:50 -07:00
parent 97d8adef82
commit b7e8b3cbb6
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vp9/encoder/vp9_skin_detection.c
View File

@ -112,7 +112,6 @@ int vp9_compute_skin_block(const uint8_t *y, const uint8_t *u, const uint8_t *v,
void vp9_compute_skin_map(VP9_COMP *const cpi, FILE *yuv_skinmap_file) { void vp9_compute_skin_map(VP9_COMP *const cpi, FILE *yuv_skinmap_file) {
int i, j, mi_row, mi_col, num_bl; int i, j, mi_row, mi_col, num_bl;
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;
uint8_t *y; uint8_t *y;
const uint8_t *src_y = cpi->Source->y_buffer; const uint8_t *src_y = cpi->Source->y_buffer;
const uint8_t *src_u = cpi->Source->u_buffer; const uint8_t *src_u = cpi->Source->u_buffer;
@ -166,19 +165,17 @@ void vp9_compute_skin_map(VP9_COMP *const cpi, FILE *yuv_skinmap_file) {
} else { } else {
int block_size = BLOCK_8X8; int block_size = BLOCK_8X8;
int consec_zeromv = 0; int consec_zeromv = 0;
if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled) { int bl_index = mi_row * cm->mi_cols + mi_col;
int bl_index = mi_row * cm->mi_cols + mi_col; int bl_index1 = bl_index + 1;
int bl_index1 = bl_index + 1; int bl_index2 = bl_index + cm->mi_cols;
int bl_index2 = bl_index + cm->mi_cols; int bl_index3 = bl_index2 + 1;
int bl_index3 = bl_index2 + 1; if (y_bsize == 8)
if (y_bsize == 8) consec_zeromv = cpi->consec_zero_mv[bl_index];
consec_zeromv = cr->consec_zero_mv[bl_index]; else
else consec_zeromv = VPXMIN(cpi->consec_zero_mv[bl_index],
consec_zeromv = VPXMIN(cr->consec_zero_mv[bl_index], VPXMIN(cpi->consec_zero_mv[bl_index1],
VPXMIN(cr->consec_zero_mv[bl_index1], VPXMIN(cpi->consec_zero_mv[bl_index2],
VPXMIN(cr->consec_zero_mv[bl_index2], cpi->consec_zero_mv[bl_index3])));
cr->consec_zero_mv[bl_index3])));
}
if (y_bsize == 16) if (y_bsize == 16)
block_size = BLOCK_16X16; block_size = BLOCK_16X16;
is_skin = vp9_compute_skin_block(src_y, src_u, src_v, src_ystride, is_skin = vp9_compute_skin_block(src_y, src_u, src_v, src_ystride,