Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
69a68719
Commit
69a68719
authored
Feb 10, 2014
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a bug where no valid partition is allowed
Change-Id: I4d2729dc5c46db2847700256941a66b0957c105d
parent
20d0f2b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
0 deletions
+17
-0
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+17
-0
No files found.
vp9/encoder/vp9_encodeframe.c
View file @
69a68719
...
...
@@ -1528,6 +1528,15 @@ static void get_sb_partition_size_range(VP9_COMP *cpi, MODE_INFO ** mi_8x8,
}
}
// Next square block size less or equal than current block size.
static
const
BLOCK_SIZE
next_square_size
[
BLOCK_SIZES
]
=
{
BLOCK_4X4
,
BLOCK_4X4
,
BLOCK_4X4
,
BLOCK_8X8
,
BLOCK_8X8
,
BLOCK_8X8
,
BLOCK_16X16
,
BLOCK_16X16
,
BLOCK_16X16
,
BLOCK_32X32
,
BLOCK_32X32
,
BLOCK_32X32
,
BLOCK_64X64
};
// Look at neighboring blocks and set a min and max partition size based on
// what they chose.
static
void
rd_auto_partition_range
(
VP9_COMP
*
cpi
,
const
TileInfo
*
const
tile
,
...
...
@@ -1594,6 +1603,14 @@ static void rd_auto_partition_range(VP9_COMP *cpi, const TileInfo *const tile,
row8x8_remaining
,
col8x8_remaining
,
&
bh
,
&
bw
);
*
min_block_size
=
MIN
(
*
min_block_size
,
*
max_block_size
);
// When use_square_partition_only is true, make sure at least one square
// partition is allowed by selecting the next smaller square size as
// *min_block_size.
if
(
cpi
->
sf
.
use_square_partition_only
&&
(
*
max_block_size
-
*
min_block_size
)
<
2
)
{
*
min_block_size
=
next_square_size
[
*
min_block_size
];
}
}
static
void
compute_fast_motion_search_level
(
VP9_COMP
*
cpi
,
BLOCK_SIZE
bsize
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment