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
Guillaume Martres
aom-rav1e
Commits
54e702b5
Commit
54e702b5
authored
Oct 11, 2013
by
Jingning Han
Committed by
Gerrit Code Review
Oct 11, 2013
Browse files
Merge "Restore mode skip feature in sub8x8 rd loop"
parents
b30445ed
c8f481fa
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rdopt.c
View file @
54e702b5
...
...
@@ -3903,6 +3903,32 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
ref_frame
=
vp9_ref_order
[
mode_index
].
ref_frame
;
second_ref_frame
=
vp9_ref_order
[
mode_index
].
second_ref_frame
;
// Look at the reference frame of the best mode so far and set the
// skip mask to look at a subset of the remaining modes.
if
(
mode_index
>
2
&&
cpi
->
sf
.
mode_skip_start
<
MAX_MODES
)
{
if
(
mode_index
==
3
)
{
switch
(
vp9_ref_order
[
best_mode_index
].
ref_frame
)
{
case
INTRA_FRAME
:
cpi
->
mode_skip_mask
=
0
;
break
;
case
LAST_FRAME
:
cpi
->
mode_skip_mask
=
0x0010
;
break
;
case
GOLDEN_FRAME
:
cpi
->
mode_skip_mask
=
0x0008
;
break
;
case
ALTREF_FRAME
:
cpi
->
mode_skip_mask
=
0x0000
;
break
;
case
NONE
:
case
MAX_REF_FRAMES
:
assert
(
!
"Invalid Reference frame"
);
}
}
if
(
cpi
->
mode_skip_mask
&
((
int64_t
)
1
<<
mode_index
))
continue
;
}
// Skip if the current reference frame has been masked off
if
(
cpi
->
sf
.
reference_masking
&&
!
cpi
->
set_ref_frame_mask
&&
(
cpi
->
ref_frame_mask
&
(
1
<<
ref_frame
)))
...
...
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