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
3f95a230
Commit
3f95a230
authored
May 27, 2014
by
Dmitry Kovalev
Browse files
Removing this_frame_stats member from TWO_PASS struct.
Change-Id: Id8877fad1f1e88b145e7c40c43174109b9c4f373
parent
1349e863
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_firstpass.c
View file @
3f95a230
...
...
@@ -495,6 +495,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
TWO_PASS
*
twopass
=
&
cpi
->
twopass
;
const
MV
zero_mv
=
{
0
,
0
};
const
YV12_BUFFER_CONFIG
*
first_ref_buf
=
lst_yv12
;
FIRSTPASS_STATS
fps
;
vp9_clear_system_state
();
...
...
@@ -789,8 +790,6 @@ void vp9_first_pass(VP9_COMP *cpi) {
vp9_clear_system_state
();
{
FIRSTPASS_STATS
fps
;
fps
.
frame
=
cm
->
current_video_frame
;
fps
.
spatial_layer_id
=
cpi
->
svc
.
spatial_layer_id
;
fps
.
intra_error
=
(
double
)(
intra_error
>>
8
);
...
...
@@ -830,8 +829,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
fps
.
duration
=
(
double
)(
cpi
->
source
->
ts_end
-
cpi
->
source
->
ts_start
);
// Don't want to do output stats with a stack variable!
twopass
->
this_frame_stats
=
fps
;
output_stats
(
&
twopass
->
this_frame_stats
,
cpi
->
output_pkt_list
);
output_stats
(
&
fps
,
cpi
->
output_pkt_list
);
accumulate_stats
(
&
twopass
->
total_stats
,
&
fps
);
}
...
...
@@ -839,9 +837,9 @@ void vp9_first_pass(VP9_COMP *cpi) {
// the prediction is good enough... but also don't allow it to lag too far.
if
((
twopass
->
sr_update_lag
>
3
)
||
((
cm
->
current_video_frame
>
0
)
&&
(
twopass
->
this_frame_stat
s
.
pcnt_inter
>
0
.
20
)
&&
((
twopass
->
this_frame_stat
s
.
intra_error
/
DOUBLE_DIVIDE_CHECK
(
twopass
->
this_frame_stat
s
.
coded_error
))
>
2
.
0
)))
{
(
fp
s
.
pcnt_inter
>
0
.
20
)
&&
((
fp
s
.
intra_error
/
DOUBLE_DIVIDE_CHECK
(
fp
s
.
coded_error
))
>
2
.
0
)))
{
if
(
gld_yv12
!=
NULL
)
{
vp8_yv12_copy_frame
(
lst_yv12
,
gld_yv12
);
}
...
...
vp9/encoder/vp9_firstpass.h
View file @
3f95a230
...
...
@@ -44,7 +44,6 @@ typedef struct {
unsigned
int
section_intra_rating
;
unsigned
int
next_iiratio
;
FIRSTPASS_STATS
total_stats
;
FIRSTPASS_STATS
this_frame_stats
;
const
FIRSTPASS_STATS
*
stats_in
;
const
FIRSTPASS_STATS
*
stats_in_start
;
const
FIRSTPASS_STATS
*
stats_in_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