Skip to content
GitLab
Menu
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
16e26866
Commit
16e26866
authored
Nov 14, 2012
by
John Koleszar
Committed by
Gerrit Code Review
Nov 14, 2012
Browse files
Merge "SEG_LVL_MODE: don't code ref_frame if it's implicit" into experimental
parents
127836d1
6d482706
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/decoder/decodemv.c
View file @
16e26866
...
...
@@ -717,7 +717,11 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
}
// Read the reference frame
mbmi
->
ref_frame
=
read_ref_frame
(
pbi
,
bc
,
mbmi
->
segment_id
);
if
(
vp9_segfeature_active
(
xd
,
mbmi
->
segment_id
,
SEG_LVL_MODE
)
&&
vp9_get_segdata
(
xd
,
mbmi
->
segment_id
,
SEG_LVL_MODE
)
<
NEARESTMV
)
mbmi
->
ref_frame
=
INTRA_FRAME
;
else
mbmi
->
ref_frame
=
read_ref_frame
(
pbi
,
bc
,
mbmi
->
segment_id
);
// If reference frame is an Inter frame
if
(
mbmi
->
ref_frame
)
{
...
...
vp9/encoder/bitstream.c
View file @
16e26866
...
...
@@ -863,7 +863,12 @@ static void pack_inter_mode_mvs(VP9_COMP *const cpi, vp9_writer *const bc) {
}
// Encode the reference frame.
encode_ref_frame
(
bc
,
pc
,
xd
,
segment_id
,
rf
);
if
(
!
vp9_segfeature_active
(
xd
,
segment_id
,
SEG_LVL_MODE
)
||
vp9_get_segdata
(
xd
,
segment_id
,
SEG_LVL_MODE
)
>=
NEARESTMV
)
{
encode_ref_frame
(
bc
,
pc
,
xd
,
segment_id
,
rf
);
}
else
{
assert
(
rf
==
INTRA_FRAME
);
}
if
(
rf
==
INTRA_FRAME
)
{
#ifdef ENTROPY_STATS
...
...
Write
Preview
Supports
Markdown
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