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
cae3fb72
Commit
cae3fb72
authored
Jul 11, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Jul 11, 2013
Browse files
Merge "Calling is_inter_mode() instead of custom code."
parents
dac5891a
8c05e590
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_bitstream.c
View file @
cae3fb72
...
...
@@ -348,11 +348,11 @@ static void pack_mb_tokens(vp9_writer* const bc,
*
tp
=
p
;
}
static
void
write_sb_mv_ref
(
vp9_writer
*
w
,
MB_PREDICTION_MODE
m
,
static
void
write_sb_mv_ref
(
vp9_writer
*
w
,
MB_PREDICTION_MODE
m
ode
,
const
vp9_prob
*
p
)
{
assert
(
NEARESTMV
<=
m
&&
m
<=
NEWMV
);
assert
(
is_inter_mode
(
mode
)
);
write_token
(
w
,
vp9_sb_mv_ref_tree
,
p
,
vp9_sb_mv_ref_encoding_array
-
NEARESTMV
+
m
);
&
vp9_sb_mv_ref_encoding_array
[
mode
-
NEARESTMV
]
);
}
...
...
vp9/encoder/vp9_rdopt.c
View file @
cae3fb72
...
...
@@ -1556,19 +1556,19 @@ static int64_t rd_pick_intra_sbuv_mode(VP9_COMP *cpi, MACROBLOCK *x,
return
best_rd
;
}
static
int
cost_mv_ref
(
VP9_COMP
*
cpi
,
MB_PREDICTION_MODE
m
,
const
int
mode_context
)
{
static
int
cost_mv_ref
(
VP9_COMP
*
cpi
,
MB_PREDICTION_MODE
mode
,
int
mode_context
)
{
MACROBLOCK
*
const
x
=
&
cpi
->
mb
;
MACROBLOCKD
*
const
xd
=
&
x
->
e_mbd
;
int
segment_id
=
xd
->
mode_info_context
->
mbmi
.
segment_id
;
const
int
segment_id
=
xd
->
mode_info_context
->
mbmi
.
segment_id
;
// Dont account for mode here if segment skip is enabled.
// Don
'
t account for mode here if segment skip is enabled.
if
(
!
vp9_segfeature_active
(
&
xd
->
seg
,
segment_id
,
SEG_LVL_SKIP
))
{
assert
(
NEARESTMV
<=
m
&&
m
<=
NEWMV
);
return
x
->
inter_mode_cost
[
mode_context
][
m
-
NEARESTMV
];
}
else
assert
(
is_inter_mode
(
mode
)
);
return
x
->
inter_mode_cost
[
mode_context
][
m
ode
-
NEARESTMV
];
}
else
{
return
0
;
}
}
void
vp9_set_mbmode_and_mvs
(
MACROBLOCK
*
x
,
MB_PREDICTION_MODE
mb
,
int_mv
*
mv
)
{
...
...
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