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
bb07de7c
Commit
bb07de7c
authored
Feb 14, 2014
by
Alex Converse
Browse files
Remove some unused and non-persistant variables from VP9_COMP.
Change-Id: I4deb1b97eec6b1244e3460a1162b41fa5312654a
parent
80ccb45c
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_onyx_int.h
View file @
bb07de7c
...
...
@@ -488,9 +488,6 @@ typedef struct VP9_COMP {
unsigned
int
mode_chosen_counts
[
MAX_MODES
];
unsigned
int
sub8x8_mode_chosen_counts
[
MAX_REFS
];
int64_t
mode_skip_mask
;
int
ref_frame_mask
;
int
set_ref_frame_mask
;
int
rd_threshes
[
MAX_SEGMENTS
][
BLOCK_SIZES
][
MAX_MODES
];
int
rd_thresh_freq_fact
[
BLOCK_SIZES
][
MAX_MODES
];
...
...
vp9/encoder/vp9_rdopt.c
View file @
bb07de7c
...
...
@@ -3149,6 +3149,8 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
const
int
bws
=
num_8x8_blocks_wide_lookup
[
bsize
]
/
2
;
const
int
bhs
=
num_8x8_blocks_high_lookup
[
bsize
]
/
2
;
int
best_skip2
=
0
;
int
ref_frame_mask
=
0
;
int
mode_skip_mask
=
0
;
x
->
skip_encode
=
cpi
->
sf
.
skip_encode_frame
&&
x
->
q_index
<
QIDX_SKIP_THRESH
;
...
...
@@ -3182,13 +3184,12 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
frame_mv
[
ZEROMV
][
ref_frame
].
as_int
=
0
;
}
cpi
->
ref_frame_mask
=
0
;
for
(
ref_frame
=
LAST_FRAME
;
ref_frame
<=
ALTREF_FRAME
&&
cpi
->
sf
.
reference_masking
;
++
ref_frame
)
{
int
i
;
for
(
i
=
LAST_FRAME
;
i
<=
ALTREF_FRAME
;
++
i
)
{
if
((
x
->
pred_mv_sad
[
ref_frame
]
>>
2
)
>
x
->
pred_mv_sad
[
i
])
{
cpi
->
ref_frame_mask
|=
(
1
<<
ref_frame
);
ref_frame_mask
|=
(
1
<<
ref_frame
);
break
;
}
}
...
...
@@ -3222,28 +3223,28 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
if
(
mode_index
==
(
cpi
->
sf
.
mode_skip_start
+
1
))
{
switch
(
vp9_mode_order
[
best_mode_index
].
ref_frame
[
0
])
{
case
INTRA_FRAME
:
cpi
->
mode_skip_mask
=
0
;
mode_skip_mask
=
0
;
break
;
case
LAST_FRAME
:
cpi
->
mode_skip_mask
=
LAST_FRAME_MODE_MASK
;
mode_skip_mask
=
LAST_FRAME_MODE_MASK
;
break
;
case
GOLDEN_FRAME
:
cpi
->
mode_skip_mask
=
GOLDEN_FRAME_MODE_MASK
;
mode_skip_mask
=
GOLDEN_FRAME_MODE_MASK
;
break
;
case
ALTREF_FRAME
:
cpi
->
mode_skip_mask
=
ALT_REF_MODE_MASK
;
mode_skip_mask
=
ALT_REF_MODE_MASK
;
break
;
case
NONE
:
case
MAX_REF_FRAMES
:
assert
(
0
&&
"Invalid Reference frame"
);
}
}
if
(
cpi
->
mode_skip_mask
&
(
(
int64_t
)
1
<<
mode_index
))
if
(
mode_skip_mask
&
(
1
<<
mode_index
))
continue
;
}
// Skip if the current reference frame has been masked off
if
(
cpi
->
ref_frame_mask
&
(
1
<<
ref_frame
)
&&
this_mode
!=
NEWMV
)
if
(
ref_frame_mask
&
(
1
<<
ref_frame
)
&&
this_mode
!=
NEWMV
)
continue
;
// Test best rd so far against threshold for trying this mode.
...
...
@@ -3768,6 +3769,8 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
int_mv
seg_mvs
[
4
][
MAX_REF_FRAMES
];
b_mode_info
best_bmodes
[
4
];
int
best_skip2
=
0
;
int
ref_frame_mask
=
0
;
int
mode_skip_mask
=
0
;
x
->
skip_encode
=
cpi
->
sf
.
skip_encode_frame
&&
x
->
q_index
<
QIDX_SKIP_THRESH
;
vpx_memset
(
x
->
zcoeff_blk
[
TX_4X4
],
0
,
4
);
...
...
@@ -3803,13 +3806,12 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
frame_mv
[
ZEROMV
][
ref_frame
].
as_int
=
0
;
}
cpi
->
ref_frame_mask
=
0
;
for
(
ref_frame
=
LAST_FRAME
;
ref_frame
<=
ALTREF_FRAME
&&
cpi
->
sf
.
reference_masking
;
++
ref_frame
)
{
int
i
;
for
(
i
=
LAST_FRAME
;
i
<=
ALTREF_FRAME
;
++
i
)
{
if
((
x
->
pred_mv_sad
[
ref_frame
]
>>
1
)
>
x
->
pred_mv_sad
[
i
])
{
cpi
->
ref_frame_mask
|=
(
1
<<
ref_frame
);
ref_frame_mask
|=
(
1
<<
ref_frame
);
break
;
}
}
...
...
@@ -3842,23 +3844,23 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
if
(
mode_index
==
3
)
{
switch
(
vp9_ref_order
[
best_mode_index
].
ref_frame
[
0
])
{
case
INTRA_FRAME
:
cpi
->
mode_skip_mask
=
0
;
mode_skip_mask
=
0
;
break
;
case
LAST_FRAME
:
cpi
->
mode_skip_mask
=
0x0010
;
mode_skip_mask
=
0x0010
;
break
;
case
GOLDEN_FRAME
:
cpi
->
mode_skip_mask
=
0x0008
;
mode_skip_mask
=
0x0008
;
break
;
case
ALTREF_FRAME
:
cpi
->
mode_skip_mask
=
0x0000
;
mode_skip_mask
=
0x0000
;
break
;
case
NONE
:
case
MAX_REF_FRAMES
:
assert
(
0
&&
"Invalid Reference frame"
);
}
}
if
(
cpi
->
mode_skip_mask
&
(
(
int64_t
)
1
<<
mode_index
))
if
(
mode_skip_mask
&
(
1
<<
mode_index
))
continue
;
}
...
...
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