summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_encodeframe.c
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2013-08-06 10:19:15 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-08-06 10:19:15 -0700
commit33afddadb9af6569bd8296ef1d48d0511b651e9d (patch)
tree944a4e9bd0977da1801ed846018c2a58e9142f18 /vp9/encoder/vp9_encodeframe.c
parent62c6aa884da8aee73996f7731cea83dc3c925194 (diff)
parent8b3faccb9e950c01daa3d9aa011970674e1ec0fc (diff)
downloadlibvpx-33afddadb9af6569bd8296ef1d48d0511b651e9d.tar
libvpx-33afddadb9af6569bd8296ef1d48d0511b651e9d.tar.gz
libvpx-33afddadb9af6569bd8296ef1d48d0511b651e9d.tar.bz2
libvpx-33afddadb9af6569bd8296ef1d48d0511b651e9d.zip
Merge "Add variance based mode/skipping"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
-rw-r--r--vp9/encoder/vp9_encodeframe.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index f4490aed9..66eae41da 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -581,6 +581,8 @@ static void pick_sb_modes(VP9_COMP *cpi, int mi_row, int mi_col,
set_offsets(cpi, mi_row, mi_col, bsize);
xd->mode_info_context->mbmi.sb_type = bsize;
+
+ x->source_variance = get_sb_variance(cpi, x, bsize);
if (cpi->oxcf.tuning == VP8_TUNE_SSIM)
vp9_activity_masking(cpi, x);
@@ -1922,6 +1924,7 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp,
MODE_INFO *m = cm->mi + idx_str;
MODE_INFO *p = cm->prev_mi + idx_str;
+ cpi->mb.source_variance = UINT_MAX;
if (cpi->sf.use_one_partition_size_always) {
set_offsets(cpi, mi_row, mi_col, BLOCK_SIZE_SB64X64);
set_partitioning(cpi, m, cpi->sf.always_this_block_size);