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

Unfork 8-bit in HBD path in vp9_model_rd_from_var_lapndz callers.

Browse Source 
BUG=b/29583530

Change-Id: Ia88a75f9572e08f228559ab84b8a77efb5aff0af
This commit is contained in:
Alex Converse 2016-06-30 10:46:08 -07:00
parent 1a3c4f91f6
commit 34201e50c1
1 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
vp9/encoder/vp9_pickmode.c
View File

@ -476,13 +476,8 @@ static void model_rd_for_sb_y_large(VP9_COMP *cpi, BLOCK_SIZE bsize,
if (!skip_dc) { if (!skip_dc) {
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize],
vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize], dc_quant >> (xd->bd - 5), &rate, &dist);
dc_quant >> (xd->bd - 5), &rate, &dist);
} else {
vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize],
dc_quant >> 3, &rate, &dist);
}
#else #else
vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize], vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize],
dc_quant >> 3, &rate, &dist); dc_quant >> 3, &rate, &dist);
@ -498,13 +493,8 @@ static void model_rd_for_sb_y_large(VP9_COMP *cpi, BLOCK_SIZE bsize,
} }
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize],
vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize], ac_quant >> (xd->bd - 5), &rate, &dist);
ac_quant >> (xd->bd - 5), &rate, &dist);
} else {
vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize],
ac_quant >> 3, &rate, &dist);
}
#else #else
vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize], vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize],
ac_quant >> 3, &rate, &dist); ac_quant >> 3, &rate, &dist);
@ -587,13 +577,8 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize,
if (!skip_dc) { if (!skip_dc) {
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize],
vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize], dc_quant >> (xd->bd - 5), &rate, &dist);
dc_quant >> (xd->bd - 5), &rate, &dist);
} else {
vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize],
dc_quant >> 3, &rate, &dist);
}
#else #else
vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize], vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bsize],
dc_quant >> 3, &rate, &dist); dc_quant >> 3, &rate, &dist);
@ -609,13 +594,8 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize,
} }
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize],
vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize], ac_quant >> (xd->bd - 5), &rate, &dist);
ac_quant >> (xd->bd - 5), &rate, &dist);
} else {
vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize],
ac_quant >> 3, &rate, &dist);
}
#else #else
vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize], vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bsize],
ac_quant >> 3, &rate, &dist); ac_quant >> 3, &rate, &dist);
@ -791,13 +771,8 @@ static void model_rd_for_sb_uv(VP9_COMP *cpi, BLOCK_SIZE plane_bsize,
tot_sse += sse; tot_sse += sse;
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bs],
vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bs], dc_quant >> (xd->bd - 5), &rate, &dist);
dc_quant >> (xd->bd - 5), &rate, &dist);
} else {
vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bs],
dc_quant >> 3, &rate, &dist);
}
#else #else
vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bs], vp9_model_rd_from_var_lapndz(sse - var, num_pels_log2_lookup[bs],
dc_quant >> 3, &rate, &dist); dc_quant >> 3, &rate, &dist);
@ -807,13 +782,8 @@ static void model_rd_for_sb_uv(VP9_COMP *cpi, BLOCK_SIZE plane_bsize,
this_rdc->dist += dist << 3; this_rdc->dist += dist << 3;
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bs],
vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bs], ac_quant >> (xd->bd - 5), &rate, &dist);
ac_quant >> (xd->bd - 5), &rate, &dist);
} else {
vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bs],
ac_quant >> 3, &rate, &dist);
}
#else #else
vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bs], vp9_model_rd_from_var_lapndz(var, num_pels_log2_lookup[bs],
ac_quant >> 3, &rate, &dist); ac_quant >> 3, &rate, &dist);