Commit ace93a17 authored by Scott LaVarnway's avatar Scott LaVarnway Committed by Gerrit Code Review
Browse files

Merge "Bug fix: call set_offsets before rd_auto_partition_range"

parents fa0cd610 41251ae5
No related merge requests found
Showing with 2 additions and 0 deletions
...@@ -1941,6 +1941,7 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp, ...@@ -1941,6 +1941,7 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp,
|| cpi->is_src_frame_alt_ref) { || cpi->is_src_frame_alt_ref) {
// If required set upper and lower partition size limits // If required set upper and lower partition size limits
if (cpi->sf.auto_min_max_partition_size) { if (cpi->sf.auto_min_max_partition_size) {
set_offsets(cpi, mi_row, mi_col, BLOCK_64X64);
rd_auto_partition_range(cpi, rd_auto_partition_range(cpi,
&cpi->sf.min_partition_size, &cpi->sf.min_partition_size,
&cpi->sf.max_partition_size); &cpi->sf.max_partition_size);
...@@ -1956,6 +1957,7 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp, ...@@ -1956,6 +1957,7 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp,
} else { } else {
// If required set upper and lower partition size limits // If required set upper and lower partition size limits
if (cpi->sf.auto_min_max_partition_size) { 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, rd_auto_partition_range(cpi, &cpi->sf.min_partition_size,
&cpi->sf.max_partition_size); &cpi->sf.max_partition_size);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment