Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
88e673d2
Commit
88e673d2
authored
Aug 18, 2017
by
Yaowu Xu
Browse files
Correctly indicate invalid partition context
BUG=aomedia:685 Change-Id: I8490af713c53e8c420ef9dffa7c27bb71bbfca54
parent
400bf651
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/common/enums.h
View file @
88e673d2
...
...
@@ -149,6 +149,7 @@ typedef char PARTITION_CONTEXT;
#define PARTITION_BLOCK_SIZES (4 + CONFIG_EXT_PARTITION)
#define PARTITION_CONTEXTS_PRIMARY (PARTITION_BLOCK_SIZES * PARTITION_PLOFFSET)
#if CONFIG_UNPOISON_PARTITION_CTX
#define INVALID_PARTITION_CTX (-1)
#define PARTITION_CONTEXTS \
(PARTITION_CONTEXTS_PRIMARY + 2 * PARTITION_BLOCK_SIZES)
#else
...
...
av1/common/onyxc_int.h
View file @
88e673d2
...
...
@@ -913,7 +913,7 @@ static INLINE int partition_plane_context(const MACROBLOCKD *xd, int mi_row,
else
if
(
!
has_rows
&&
has_cols
)
return
PARTITION_CONTEXTS_PRIMARY
+
PARTITION_BLOCK_SIZES
+
bsl
;
else
return
PARTITION_C
ONTEXTS
;
// Bogus context, forced SPLIT
return
INVALID_
PARTITION_C
TX
;
// Bogus context, forced SPLIT
#else
const
PARTITION_CONTEXT
*
above_ctx
=
xd
->
above_seg_context
+
mi_col
;
const
PARTITION_CONTEXT
*
left_ctx
=
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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