summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2014-04-11 15:50:02 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-04-11 15:50:02 -0700
commiteb0c52bacaed9b35484bbd55865916e12a4fd6d7 (patch)
treeae05ef1e20ae819c5fc9cac63bdb4f13dc79c966 /vp9/encoder
parent2ebd7f12e135920ae084a79fb8d1cd39b1cfbc0a (diff)
parent1243d265cfa66c09f296f2ccf4c616fde85bb81b (diff)
downloadlibvpx-eb0c52bacaed9b35484bbd55865916e12a4fd6d7.tar
libvpx-eb0c52bacaed9b35484bbd55865916e12a4fd6d7.tar.gz
libvpx-eb0c52bacaed9b35484bbd55865916e12a4fd6d7.tar.bz2
libvpx-eb0c52bacaed9b35484bbd55865916e12a4fd6d7.zip
Merge "Replace the call to set_offsets()"
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_encodeframe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 83c6a33c7..d1db1d131 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1463,6 +1463,8 @@ static void set_source_var_based_partition(VP9_COMP *cpi,
int r, c;
MODE_INFO *mi_upper_left = cm->mi + mi_row * mis + mi_col;
+ vp9_setup_src_planes(x, cpi->Source, mi_row, mi_col);
+
assert((row8x8_remaining > 0) && (col8x8_remaining > 0));
// In-image SB64
@@ -3193,7 +3195,6 @@ static void encode_nonrd_sb_row(VP9_COMP *cpi, const TileInfo *const tile,
1, &dummy_rate, &dummy_dist);
break;
case SOURCE_VAR_BASED_PARTITION:
- set_offsets(cpi, tile, mi_row, mi_col, BLOCK_64X64);
set_source_var_based_partition(cpi, tile, mi_8x8, mi_row, mi_col);
nonrd_use_partition(cpi, tile, mi_8x8, tp, mi_row, mi_col, BLOCK_64X64,
1, &dummy_rate, &dummy_dist);