Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
c6ef7569
Commit
c6ef7569
authored
Feb 16, 2011
by
Attila Nagy
Browse files
Dont pick encoder filter level when loopfilter is disabled.
Change-Id: I58154faf4f3ece24f9927a5c3ab7e830e0887fb6
parent
b2ae57f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp8/encoder/onyx_if.c
View file @
c6ef7569
...
...
@@ -4410,22 +4410,25 @@ static void encode_frame_to_data_rate
//#pragma omp section
{
struct
vpx_usec_timer
timer
;
vpx_usec_timer_start
(
&
timer
);
if
(
cpi
->
sf
.
auto_filter
==
0
)
vp8cx_pick_filter_level_fast
(
cpi
->
Source
,
cpi
);
if
(
cm
->
no_lpf
)
{
cm
->
filter_level
=
0
;
}
else
vp8cx_pick_filter_level
(
cpi
->
Source
,
cpi
);
{
struct
vpx_usec_timer
timer
;
vpx_usec_timer_
m
ar
k
(
&
timer
);
vpx_usec_timer_
st
ar
t
(
&
timer
);
cpi
->
time_pick_lpf
+=
vpx_usec_timer_elapsed
(
&
timer
);
if
(
cpi
->
sf
.
auto_filter
==
0
)
vp8cx_pick_filter_level_fast
(
cpi
->
Source
,
cpi
);
else
vp8cx_pick_filter_level
(
cpi
->
Source
,
cpi
);
if
(
cm
->
no_lpf
)
cm
->
filter_level
=
0
;
vpx_usec_timer_mark
(
&
timer
);
cpi
->
time_pick_lpf
+=
vpx_usec_timer_elapsed
(
&
timer
);
}
if
(
cm
->
filter_level
>
0
)
{
...
...
@@ -4434,7 +4437,9 @@ static void encode_frame_to_data_rate
cm
->
last_filter_type
=
cm
->
filter_type
;
cm
->
last_sharpness_level
=
cm
->
sharpness_level
;
}
/* Move storing frame_type out of the above loop since it is also needed in motion search besides loopfilter */
/* Move storing frame_type out of the above loop since it is also
* needed in motion search besides loopfilter */
cm
->
last_frame_type
=
cm
->
frame_type
;
vp8_yv12_extend_frame_borders_ptr
(
cm
->
frame_to_show
);
...
...
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