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
14ed7a61
Commit
14ed7a61
authored
Apr 19, 2016
by
Thomas Daede
Committed by
Yaowu Xu
May 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix decoding Daala deringing and CLPF filters with tiling.
Change-Id: I077b0e97186bdd292f925e08966a2ca3cf8c250d
parent
d54236a9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+10
-9
No files found.
av1/decoder/decodeframe.c
View file @
14ed7a61
...
...
@@ -1632,15 +1632,6 @@ static const uint8_t *decode_tiles(AV1Decoder *pbi, const uint8_t *data,
lf_data
->
stop
=
cm
->
mi_rows
;
winterface
->
execute
(
&
pbi
->
lf_worker
);
}
#if CONFIG_CLPF
if
(
cm
->
clpf
&&
!
cm
->
skip_loop_filter
)
av1_clpf_frame
(
&
pbi
->
cur_buf
->
buf
,
cm
,
&
pbi
->
mb
);
#endif
#if CONFIG_DERING
if
(
cm
->
dering_level
&&
!
cm
->
skip_loop_filter
)
{
av1_dering_frame
(
&
pbi
->
cur_buf
->
buf
,
cm
,
&
pbi
->
mb
,
cm
->
dering_level
);
}
#endif // CONFIG_DERING
// Get last tile data.
tile_data
=
pbi
->
tile_data
+
tile_cols
*
tile_rows
-
1
;
...
...
@@ -2447,6 +2438,16 @@ void av1_decode_frame(AV1Decoder *pbi, const uint8_t *data,
*
p_data_end
=
decode_tiles
(
pbi
,
data
+
first_partition_size
,
data_end
);
}
#if CONFIG_CLPF
if
(
cm
->
clpf
&&
!
cm
->
skip_loop_filter
)
av1_clpf_frame
(
&
pbi
->
cur_buf
->
buf
,
cm
,
&
pbi
->
mb
);
#endif
#if CONFIG_DERING
if
(
cm
->
dering_level
&&
!
cm
->
skip_loop_filter
)
{
av1_dering_frame
(
&
pbi
->
cur_buf
->
buf
,
cm
,
&
pbi
->
mb
,
cm
->
dering_level
);
}
#endif // CONFIG_DERING
if
(
!
xd
->
corrupted
)
{
if
(
cm
->
refresh_frame_context
==
REFRESH_FRAME_CONTEXT_BACKWARD
)
{
av1_adapt_coef_probs
(
cm
);
...
...
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