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
5dc0b309
Commit
5dc0b309
authored
Aug 19, 2013
by
Jingning Han
Committed by
Gerrit Code Review
Aug 19, 2013
Browse files
Merge "Fix the returned distortion value in rd_pick_intra"
parents
2e3478a5
f67919ae
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rdopt.c
View file @
5dc0b309
...
...
@@ -3016,13 +3016,13 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
if
(
y_skip
&&
uv_skip
)
{
*
returnrate
=
rate_y
+
rate_uv
-
rate_y_tokenonly
-
rate_uv_tokenonly
+
vp9_cost_bit
(
vp9_get_pred_prob_mbskip
(
cm
,
xd
),
1
);
*
returndist
=
dist_y
+
(
dist_uv
>>
2
)
;
*
returndist
=
dist_y
+
dist_uv
;
vp9_zero
(
ctx
->
tx_rd_diff
);
}
else
{
int
i
;
*
returnrate
=
rate_y
+
rate_uv
+
vp9_cost_bit
(
vp9_get_pred_prob_mbskip
(
cm
,
xd
),
0
);
*
returndist
=
dist_y
+
(
dist_uv
>>
2
)
;
*
returndist
=
dist_y
+
dist_uv
;
if
(
cpi
->
sf
.
tx_size_search_method
==
USE_FULL_RD
)
for
(
i
=
0
;
i
<
TX_MODES
;
i
++
)
ctx
->
tx_rd_diff
[
i
]
=
tx_cache
[
i
]
-
tx_cache
[
cm
->
tx_mode
];
...
...
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