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
1df427ef
Commit
1df427ef
authored
Mar 23, 2017
by
Jean-Marc Valin
Committed by
Jean-Marc Valin
Mar 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ext_partition with cdef
Change-Id: If3a4c7e6aee747afd675e0233560f6e721c10f79
parent
9620bcd5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
13 deletions
+6
-13
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+4
-7
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+2
-6
No files found.
av1/decoder/decodeframe.c
View file @
1df427ef
...
...
@@ -2385,14 +2385,11 @@ static void decode_partition(AV1Decoder *const pbi, MACROBLOCKD *const xd,
#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
.
dering_gain
=
aom_read_literal
(
r
,
cm
->
dering_bits
,
ACCT_STR
);
cm
->
mi_grid_visible
[
mi_row
*
cm
->
mi_stride
+
mi_col
]
->
mbmi
.
clpf_strength
=
aom_read_literal
(
r
,
cm
->
clpf_bits
,
ACCT_STR
);
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
.
dering_gain
=
cm
->
mi_grid_visible
[
mi_row
*
cm
->
mi_stride
+
mi_col
]
->
mbmi
.
clpf_strength
=
0
;
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
...
...
av1/encoder/bitstream.c
View file @
1df427ef
...
...
@@ -2777,13 +2777,9 @@ static void write_modes_sb(AV1_COMP *const cpi, const TileInfo *const tile,
#if CONFIG_EXT_PARTITION
if
(
cm
->
sb_size
==
BLOCK_128X128
&&
bsize
==
BLOCK_128X128
&&
!
sb_all_skip
(
cm
,
mi_row
,
mi_col
))
{
aom_write_literal
(
w
,
cm
->
mi_grid_visible
[
mi_row
*
cm
->
mi_stride
+
mi_col
]
->
mbmi
.
dering_gain
,
cm
->
dering_bits
);
aom_write_literal
(
w
,
cm
->
mi_grid_visible
[
mi_row
*
cm
->
mi_stride
+
mi_col
]
->
mbmi
.
c
lp
f_strength
,
cm
->
c
lp
f_bits
);
->
mbmi
.
c
de
f_strength
,
cm
->
c
de
f_bits
);
}
else
if
(
cm
->
sb_size
==
BLOCK_64X64
&&
bsize
==
BLOCK_64X64
&&
#else
if
(
bsize
==
BLOCK_64X64
&&
...
...
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