summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorScott LaVarnway <slavarnway@google.com>2013-08-09 14:09:49 -0400
committerScott LaVarnway <slavarnway@google.com>2013-08-09 14:09:49 -0400
commit41251ae55823bb778dc461539fa995ccb19f5961 (patch)
tree55372a3225e0cbbe5b09561d57181cd9ec9f1430 /vp9
parent0eef1acbefe1eb935f6c757cfb62b24941a58b60 (diff)
downloadlibvpx-41251ae55823bb778dc461539fa995ccb19f5961.tar
libvpx-41251ae55823bb778dc461539fa995ccb19f5961.tar.gz
libvpx-41251ae55823bb778dc461539fa995ccb19f5961.tar.bz2
libvpx-41251ae55823bb778dc461539fa995ccb19f5961.zip
Bug fix: call set_offsets before rd_auto_partition_range
The set_offsets call is necessary inorder to set the mode_info_context ptr correctly. Change-Id: I644910cc5bacc50ee9cd78458843274ad8ee636d
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_encodeframe.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 033b6a8df..5d09024df 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1941,6 +1941,7 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp,
|| cpi->is_src_frame_alt_ref) {
// If required set upper and lower partition size limits
if (cpi->sf.auto_min_max_partition_size) {
+ set_offsets(cpi, mi_row, mi_col, BLOCK_64X64);
rd_auto_partition_range(cpi,
&cpi->sf.min_partition_size,
&cpi->sf.max_partition_size);
@@ -1956,6 +1957,7 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp,
} else {
// If required set upper and lower partition size limits
if (cpi->sf.auto_min_max_partition_size) {
+ set_offsets(cpi, mi_row, mi_col, BLOCK_64X64);
rd_auto_partition_range(cpi, &cpi->sf.min_partition_size,
&cpi->sf.max_partition_size);
}