Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
60b36abf
Commit
60b36abf
authored
Apr 26, 2012
by
John Koleszar
Committed by
Gerrit Code Review
Apr 26, 2012
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fix loopfilter race condition in multithreaded encoder" into eider
parents
061a16d9
3939e85b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
8 deletions
+19
-8
vp8/encoder/onyx_if.c
vp8/encoder/onyx_if.c
+19
-8
No files found.
vp8/encoder/onyx_if.c
View file @
60b36abf
...
...
@@ -1412,6 +1412,15 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
if
(
!
oxcf
)
return
;
#if CONFIG_MULTITHREAD
/* wait for the last picture loopfilter thread done */
if
(
cpi
->
b_lpf_running
)
{
sem_wait
(
&
cpi
->
h_event_end_lpf
);
cpi
->
b_lpf_running
=
0
;
}
#endif
if
(
cm
->
version
!=
oxcf
->
Version
)
{
cm
->
version
=
oxcf
->
Version
;
...
...
@@ -3194,6 +3203,15 @@ static void encode_frame_to_data_rate
// Clear down mmx registers to allow floating point in what follows
vp8_clear_system_state
();
#if CONFIG_MULTITHREAD
/* wait for the last picture loopfilter thread done */
if
(
cpi
->
b_lpf_running
)
{
sem_wait
(
&
cpi
->
h_event_end_lpf
);
cpi
->
b_lpf_running
=
0
;
}
#endif
// Test code for segmentation of gf/arf (0,0)
//segmentation_test_function( cpi);
...
...
@@ -3748,14 +3766,7 @@ static void encode_frame_to_data_rate
vp8_setup_key_frame
(
cpi
);
}
#if CONFIG_MULTITHREAD
/* wait for the last picture loopfilter thread done */
if
(
cpi
->
b_lpf_running
)
{
sem_wait
(
&
cpi
->
h_event_end_lpf
);
cpi
->
b_lpf_running
=
0
;
}
#endif
#if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING
{
...
...
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