Skip to content
GitLab
Menu
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
2886b917
Commit
2886b917
authored
Sep 05, 2014
by
James Zern
Committed by
Gerrit Code Review
Sep 05, 2014
Browse files
Merge "vp9: skip loopfilter when the frame is corrupt"
parents
02a0c51e
db8b1b7b
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/decoder/vp9_decodeframe.c
View file @
2886b917
...
...
@@ -892,7 +892,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi,
pbi
->
mb
.
corrupted
|=
tile_data
->
xd
.
corrupted
;
}
// Loopfilter one row.
if
(
cm
->
lf
.
filter_level
)
{
if
(
cm
->
lf
.
filter_level
&&
!
pbi
->
mb
.
corrupted
)
{
const
int
lf_start
=
mi_row
-
MI_BLOCK_SIZE
;
LFWorkerData
*
const
lf_data
=
(
LFWorkerData
*
)
pbi
->
lf_worker
.
data1
;
...
...
@@ -915,7 +915,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi,
}
// Loopfilter remaining rows in the frame.
if
(
cm
->
lf
.
filter_level
)
{
if
(
cm
->
lf
.
filter_level
&&
!
pbi
->
mb
.
corrupted
)
{
LFWorkerData
*
const
lf_data
=
(
LFWorkerData
*
)
pbi
->
lf_worker
.
data1
;
winterface
->
sync
(
&
pbi
->
lf_worker
);
lf_data
->
start
=
lf_data
->
stop
;
...
...
@@ -1442,9 +1442,11 @@ void vp9_decode_frame(VP9Decoder *pbi,
if
(
pbi
->
max_threads
>
1
&&
tile_rows
==
1
&&
tile_cols
>
1
&&
cm
->
frame_parallel_decoding_mode
)
{
*
p_data_end
=
decode_tiles_mt
(
pbi
,
data
+
first_partition_size
,
data_end
);
// If multiple threads are used to decode tiles, then we use those threads
// to do parallel loopfiltering.
vp9_loop_filter_frame_mt
(
new_fb
,
pbi
,
cm
,
cm
->
lf
.
filter_level
,
0
);
if
(
!
xd
->
corrupted
)
{
// If multiple threads are used to decode tiles, then we use those threads
// to do parallel loopfiltering.
vp9_loop_filter_frame_mt
(
new_fb
,
pbi
,
cm
,
cm
->
lf
.
filter_level
,
0
);
}
}
else
{
*
p_data_end
=
decode_tiles
(
pbi
,
data
+
first_partition_size
,
data_end
);
}
...
...
Write
Preview
Supports
Markdown
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