Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
a6246927
Commit
a6246927
authored
Mar 22, 2016
by
Yaowu Xu
Committed by
Gerrit Code Review
Mar 22, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Simplify the loopfilter synchronization logic in VP8 encoder"
parents
bfc2a7e3
b198bcd5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
34 deletions
+2
-34
vp8/encoder/ethreading.c
vp8/encoder/ethreading.c
+0
-1
vp8/encoder/onyx_if.c
vp8/encoder/onyx_if.c
+2
-32
vp8/encoder/onyx_int.h
vp8/encoder/onyx_int.h
+0
-1
No files found.
vp8/encoder/ethreading.c
View file @
a6246927
...
...
@@ -518,7 +518,6 @@ int vp8cx_create_encoder_threads(VP8_COMP *cpi)
cpi
->
b_multi_threaded
=
0
;
cpi
->
encoding_thread_count
=
0
;
cpi
->
b_lpf_running
=
0
;
pthread_mutex_init
(
&
cpi
->
mt_mutex
,
NULL
);
...
...
vp8/encoder/onyx_if.c
View file @
a6246927
...
...
@@ -1531,15 +1531,6 @@ 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
;
...
...
@@ -3638,15 +3629,6 @@ 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
if
(
cpi
->
force_next_frame_intra
)
{
cm
->
frame_type
=
KEY_FRAME
;
/* delayed intra frame */
...
...
@@ -4375,8 +4357,6 @@ static void encode_frame_to_data_rate
vp8_setup_key_frame
(
cpi
);
}
#if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING
{
if
(
cpi
->
oxcf
.
error_resilient_mode
)
...
...
@@ -4842,7 +4822,6 @@ static void encode_frame_to_data_rate
{
/* start loopfilter in separate thread */
sem_post
(
&
cpi
->
h_event_start_lpf
);
cpi
->
b_lpf_running
=
1
;
}
else
#endif
...
...
@@ -4874,11 +4853,10 @@ static void encode_frame_to_data_rate
vp8_pack_bitstream
(
cpi
,
dest
,
dest_end
,
size
);
#if CONFIG_MULTITHREAD
/*
if PSNR packets are generated we have to wait for the lpf
*/
if
(
cpi
->
b_
lpf_running
&&
cpi
->
b_calculate_psnr
)
/*
wait for the lpf thread done
*/
if
(
cpi
->
b_
multi_threaded
)
{
sem_wait
(
&
cpi
->
h_event_end_lpf
);
cpi
->
b_lpf_running
=
0
;
}
#endif
...
...
@@ -5838,14 +5816,6 @@ int vp8_get_preview_raw_frame(VP8_COMP *cpi, YV12_BUFFER_CONFIG *dest, vp8_ppfla
{
int
ret
;
#if CONFIG_MULTITHREAD
if
(
cpi
->
b_lpf_running
)
{
sem_wait
(
&
cpi
->
h_event_end_lpf
);
cpi
->
b_lpf_running
=
0
;
}
#endif
#if CONFIG_POSTPROC
cpi
->
common
.
show_frame_mi
=
cpi
->
common
.
mi
;
ret
=
vp8_post_proc_frame
(
&
cpi
->
common
,
dest
,
flags
);
...
...
vp8/encoder/onyx_int.h
View file @
a6246927
...
...
@@ -536,7 +536,6 @@ typedef struct VP8_COMP
int
mt_sync_range
;
int
b_multi_threaded
;
int
encoding_thread_count
;
int
b_lpf_running
;
pthread_t
*
h_encoding_thread
;
pthread_t
h_filter_thread
;
...
...
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