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
9e4df2bc
Commit
9e4df2bc
authored
Jun 08, 2011
by
John Koleszar
Committed by
Code Review
Jun 08, 2011
Browse files
Merge "vp8_pick_intra_mode: correct returned rate"
parents
254a7483
91907e0b
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp8/encoder/pickinter.c
View file @
9e4df2bc
...
...
@@ -972,7 +972,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
void
vp8_pick_intra_mode
(
VP8_COMP
*
cpi
,
MACROBLOCK
*
x
,
int
*
rate_
)
{
int
error4x4
,
error16x16
=
INT_MAX
;
int
rate
,
distortion
,
best_distortion
;
int
rate
,
best_rate
=
0
,
distortion
,
best_distortion
;
MB_PREDICTION_MODE
mode
,
best_mode
=
DC_PRED
;
int
this_rd
;
...
...
@@ -995,6 +995,7 @@ void vp8_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate_)
error16x16
=
this_rd
;
best_mode
=
mode
;
best_distortion
=
distortion
;
best_rate
=
rate
;
}
}
x
->
e_mbd
.
mode_info_context
->
mbmi
.
mode
=
best_mode
;
...
...
@@ -1002,7 +1003,10 @@ void vp8_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate_)
error4x4
=
pick_intra4x4mby_modes
(
IF_RTCD
(
&
cpi
->
rtcd
),
x
,
&
rate
,
&
best_distortion
);
if
(
error4x4
<
error16x16
)
{
x
->
e_mbd
.
mode_info_context
->
mbmi
.
mode
=
B_PRED
;
best_rate
=
rate
;
}
*
rate_
=
rate
;
*
rate_
=
best_
rate
;
}
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