summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_rdopt.c
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2014-09-30 21:56:33 -0700
committerDeb Mukherjee <debargha@google.com>2014-10-01 14:18:11 -0700
commita160d72522fd8572943966e96b65dd232fe048ea (patch)
tree4a57c191c40619d16bea6d14cbde1f9e068d1d27 /vp9/encoder/vp9_rdopt.c
parent10c7876a8e5a638c89eb06913e7c44a756e6d35d (diff)
downloadlibvpx-a160d72522fd8572943966e96b65dd232fe048ea.tar
libvpx-a160d72522fd8572943966e96b65dd232fe048ea.tar.gz
libvpx-a160d72522fd8572943966e96b65dd232fe048ea.tar.bz2
libvpx-a160d72522fd8572943966e96b65dd232fe048ea.zip
High-bitdepth bugfixes
Miscellaneous bug-fixes for high bitdepth functionality. With this patch, high bit-depth profiles become mostly functional, except for an intermittent assert failure issue that is being tracked. Change-Id: I6a7fcbdcf1e5b09842e88535f8442d2e1230748c
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
-rw-r--r--vp9/encoder/vp9_rdopt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index bf0de4b29..f52e55c96 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -246,11 +246,11 @@ static void model_rd_for_sb(VP9_COMP *cpi, BLOCK_SIZE bsize,
} else {
#if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
- vp9_model_rd_from_var_lapndz(sse, 1 << num_pels_log2_lookup[bs],
+ vp9_model_rd_from_var_lapndz(sum_sse, 1 << num_pels_log2_lookup[bs],
pd->dequant[1] >> (xd->bd - 5),
&rate, &dist);
} else {
- vp9_model_rd_from_var_lapndz(sse, 1 << num_pels_log2_lookup[bs],
+ vp9_model_rd_from_var_lapndz(sum_sse, 1 << num_pels_log2_lookup[bs],
pd->dequant[1] >> 3, &rate, &dist);
}
#else