Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
libvpx
Commits
1c84e73e
Commit
1c84e73e
authored
Oct 31, 2014
by
Jingning Han
Committed by
Gerrit Code Review
Oct 31, 2014
Browse files
Merge "Fix mode index use case in vp9_pick_inter_mode"
parents
61966b1d
64348d9f
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_pickmode.c
View file @
1c84e73e
...
...
@@ -606,6 +606,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
for
(
this_mode
=
NEARESTMV
;
this_mode
<=
NEWMV
;
++
this_mode
)
{
int
rate_mv
=
0
;
int
mode_rd_thresh
;
int
mode_index
=
mode_idx
[
ref_frame
][
INTER_OFFSET
(
this_mode
)];
if
(
const_motion
[
ref_frame
]
&&
this_mode
==
NEARMV
)
continue
;
...
...
@@ -613,10 +614,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if
(
!
(
cpi
->
sf
.
inter_mode_mask
[
bsize
]
&
(
1
<<
this_mode
)))
continue
;
mode_rd_thresh
=
rd_threshes
[
mode_idx
[
ref_frame
][
INTER_OFFSET
(
this_mode
)]];
mode_rd_thresh
=
rd_threshes
[
mode_index
];
if
(
rd_less_than_thresh
(
best_rdc
.
rdcost
,
mode_rd_thresh
,
rd_thresh_freq_fact
[
this_mode
]))
rd_thresh_freq_fact
[
mode_index
]))
continue
;
if
(
this_mode
==
NEWMV
)
{
...
...
@@ -839,12 +839,12 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if
(
is_inter_block
(
mbmi
))
vp9_update_rd_thresh_fact
(
tile_data
->
thresh_freq_fact
,
cpi
->
sf
.
adaptive_rd_thresh
,
bsize
,
mode_idx
[
ref_frame
][
INTER_OFFSET
(
mbmi
->
mode
)]);
cpi
->
sf
.
adaptive_rd_thresh
,
bsize
,
mode_idx
[
best_
ref_frame
][
INTER_OFFSET
(
mbmi
->
mode
)]);
else
vp9_update_rd_thresh_fact
(
tile_data
->
thresh_freq_fact
,
cpi
->
sf
.
adaptive_rd_thresh
,
bsize
,
mode_idx
[
ref_frame
][
mbmi
->
mode
]);
mode_idx
[
INTRA_FRAME
][
mbmi
->
mode
]);
*
rd_cost
=
best_rdc
;
}
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