Skip to content
GitLab
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
c6f9b7f4
Commit
c6f9b7f4
authored
Jul 07, 2016
by
Debargha Mukherjee
Committed by
Gerrit Code Review
Jul 07, 2016
Browse files
Merge "RD costing fix in loop-restoration expt" into nextgenv2
parents
51957b41
aab64cdd
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp10/encoder/pickrst.c
View file @
c6f9b7f4
...
...
@@ -77,7 +77,7 @@ static int search_bilateral_level(const YV12_BUFFER_CONFIG *sd,
err
=
try_restoration_frame
(
sd
,
cpi
,
&
rsi
,
partial_frame
);
bits
=
0
;
best_cost
=
RDCOST_DBL
(
x
->
rdmult
,
x
->
rddiv
,
(
bits
<<
(
VP9_PROB_COST_SHIFT
-
6
)),
err
);
(
bits
<<
(
VP9_PROB_COST_SHIFT
-
4
)),
err
);
for
(
i
=
0
;
i
<
restoration_levels
;
++
i
)
{
rsi
.
restoration_type
=
RESTORE_BILATERAL
;
rsi
.
restoration_level
=
i
;
...
...
@@ -87,7 +87,7 @@ static int search_bilateral_level(const YV12_BUFFER_CONFIG *sd,
// ratios appropriately but not exactly by these values.
bits
=
restoration_level_bits
;
cost
=
RDCOST_DBL
(
x
->
rdmult
,
x
->
rddiv
,
(
bits
<<
(
VP9_PROB_COST_SHIFT
-
6
)),
err
);
(
bits
<<
(
VP9_PROB_COST_SHIFT
-
4
)),
err
);
if
(
cost
<
best_cost
)
{
restoration_best
=
i
;
best_cost
=
cost
;
...
...
@@ -536,7 +536,7 @@ static int search_wiener_filter(const YV12_BUFFER_CONFIG *src,
err
=
try_restoration_frame
(
src
,
cpi
,
&
rsi
,
partial_frame
);
bits
=
0
;
cost_norestore
=
RDCOST_DBL
(
x
->
rdmult
,
x
->
rddiv
,
(
bits
<<
(
VP9_PROB_COST_SHIFT
-
6
)),
err
);
(
bits
<<
(
VP9_PROB_COST_SHIFT
-
4
)),
err
);
#if CONFIG_VP9_HIGHBITDEPTH
if
(
cm
->
use_highbitdepth
)
...
...
@@ -574,7 +574,7 @@ static int search_wiener_filter(const YV12_BUFFER_CONFIG *src,
err
=
try_restoration_frame
(
src
,
cpi
,
&
rsi
,
partial_frame
);
bits
=
WIENER_FILT_BITS
;
cost_wiener
=
RDCOST_DBL
(
x
->
rdmult
,
x
->
rddiv
,
(
bits
<<
(
VP9_PROB_COST_SHIFT
-
6
)),
err
);
(
bits
<<
(
VP9_PROB_COST_SHIFT
-
4
)),
err
);
vpx_yv12_copy_y
(
&
cpi
->
last_frame_uf
,
cm
->
frame_to_show
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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