Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
df068334
Commit
df068334
authored
May 09, 2017
by
Jingning Han
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix enc/dec mismatch in ext-partition and cdef
BUG=aomedia:455 Change-Id: I97ecab4f01417734c83a9b8886f145236c9b38a5
parent
fc1aac56
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
13 deletions
+1
-13
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+1
-13
No files found.
av1/decoder/decodeframe.c
View file @
df068334
...
...
@@ -2338,19 +2338,7 @@ static void decode_partition(AV1Decoder *const pbi, MACROBLOCKD *const xd,
#endif // CONFIG_EXT_PARTITION_TYPES
#if CONFIG_CDEF
#if CONFIG_EXT_PARTITION
if
(
cm
->
sb_size
==
BLOCK_128X128
&&
bsize
==
BLOCK_128X128
)
{
if
(
!
sb_all_skip
(
cm
,
mi_row
,
mi_col
))
{
cm
->
mi_grid_visible
[
mi_row
*
cm
->
mi_stride
+
mi_col
]
->
mbmi
.
cdef_strength
=
aom_read_literal
(
r
,
cm
->
cdef_bits
,
ACCT_STR
);
}
else
{
cm
->
mi_grid_visible
[
mi_row
*
cm
->
mi_stride
+
mi_col
]
->
mbmi
.
cdef_strength
=
0
;
}
}
else
if
(
cm
->
sb_size
==
BLOCK_64X64
&&
bsize
==
BLOCK_64X64
)
{
#else
if
(
bsize
==
BLOCK_64X64
)
{
#endif
if
(
bsize
==
cm
->
sb_size
)
{
if
(
!
sb_all_skip
(
cm
,
mi_row
,
mi_col
))
{
cm
->
mi_grid_visible
[
mi_row
*
cm
->
mi_stride
+
mi_col
]
->
mbmi
.
cdef_strength
=
aom_read_literal
(
r
,
cm
->
cdef_bits
,
ACCT_STR
);
...
...
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