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

intrabc: Allow odd pel displacement for non-444

Browse Source 
intrabc:
screen_content: -0.618 derflr: +0.015

intrabc+tx_skip+palette:
screen_content: -0.124 derflr: -0.048

Change-Id: Iabea4be19dce2f6fdab8f639e585a424c90c81b4
This commit is contained in:
Alex Converse 2015-06-24 11:17:50 -07:00
parent a4f4ed60cf
commit 5241acf6e2
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vp9/encoder/vp9_rdopt.c
View File

@ -1455,7 +1455,6 @@ static INLINE int mv_check_bounds(const MACROBLOCK *x, const MV *mv) {
}
#if CONFIG_INTRABC
#define ODD_PEL_DV 0 // Allow odd pel displacemnt vectors
static void intrabc_search(VP9_COMP *cpi, MACROBLOCK *x,
BLOCK_SIZE bsize,
int mi_row, int mi_col,
@ -1523,23 +1522,28 @@ static void intrabc_search(VP9_COMP *cpi, MACROBLOCK *x,
assert(tmp_mv->as_int != 0);
if (bestsme < INT_MAX) {
if (pd[1].subsampling_x != 0 || pd[1].subsampling_y != 0) {
#if ODD_PEL_DV
// Check that the vector doesn't require uv subpel interpolation pixels
// from outside of the coded area.
if (pd[1].subsampling_y != 0) {
if (tmp_mv->as_mv.col > -w) {
assert(tmp_mv->as_mv.row <= -h);
if (tmp_mv->as_mv.row == -h - 1) {
tmp_mv->as_mv.row = tmp_mv->as_mv.row / 2 * 2;
}
} else {
assert(tmp_mv->as_mv.row <= 8 * 8 - h);
if (tmp_mv->as_mv.row == 8 * 8 - h - 1) {
assert(tmp_mv->as_mv.row <= (sb_mi_row + 8 - mi_row) * 8 - h);
if (tmp_mv->as_mv.row == (sb_mi_row + 8 - mi_row) * 8 - h - 1) {
tmp_mv->as_mv.row = tmp_mv->as_mv.row / 2 * 2;
}
}
#else
tmp_mv->as_mv.row = tmp_mv->as_mv.row / 2 * 2;
tmp_mv->as_mv.col = tmp_mv->as_mv.col / 2 * 2;
#endif // ODD_PEL_DV
}
if (pd[1].subsampling_x != 0) {
if (tmp_mv->as_mv.row > -h) {
assert(tmp_mv->as_mv.col <= -(mi_col - sb_mi_col) * 8 - w);
if (tmp_mv->as_mv.col == -(mi_col - sb_mi_col) * 8 - w - 1) {
tmp_mv->as_mv.col = tmp_mv->as_mv.col / 2 * 2;
}
}
}
tmp_mv->as_mv.row *= 8;
tmp_mv->as_mv.col *= 8;