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
Xiph.Org
aom-rav1e
Commits
aee00911
Commit
aee00911
authored
May 31, 2016
by
Alex Converse
Browse files
Replace some vpxbool calls with entropy coder agnostic calls.
Change-Id: Ifbcd0714fcf994c43b69255185456c7a255df66c
parent
e89ca180
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp10/decoder/decodemv.c
View file @
aee00911
...
...
@@ -780,7 +780,7 @@ static void read_ref_frames(VP10_COMMON *const cm, MACROBLOCKD *const xd,
ref_frame
[
!
idx
]
=
cm
->
comp_fwd_ref
[
bit
];
{
const
int
ctx1
=
vp10_get_pred_context_comp_bwdref_p
(
cm
,
xd
);
const
int
bit1
=
vp
x
_read
(
r
,
fc
->
comp_bwdref_prob
[
ctx1
][
0
]);
const
int
bit1
=
vp
10
_read
(
r
,
fc
->
comp_bwdref_prob
[
ctx1
][
0
]);
if
(
counts
)
++
counts
->
comp_bwdref
[
ctx1
][
0
][
bit1
];
ref_frame
[
idx
]
=
cm
->
comp_bwd_ref
[
bit1
];
...
...
@@ -860,7 +860,7 @@ static void read_ref_frames(VP10_COMMON *const cm, MACROBLOCKD *const xd,
#if CONFIG_BIDIR_PRED
if
(
bit1
)
{
const
int
ctx2
=
vp10_get_pred_context_single_ref_p3
(
xd
);
const
int
bit2
=
vp
x
_read
(
r
,
fc
->
single_ref_prob
[
ctx2
][
2
]);
const
int
bit2
=
vp
10
_read
(
r
,
fc
->
single_ref_prob
[
ctx2
][
2
]);
if
(
counts
)
++
counts
->
single_ref
[
ctx2
][
2
][
bit2
];
ref_frame
[
0
]
=
bit2
?
ALTREF_FRAME
:
BWDREF_FRAME
;
...
...
vp10/encoder/bitstream.c
View file @
aee00911
...
...
@@ -857,7 +857,7 @@ static void write_ref_frames(const VP10_COMMON *cm, const MACROBLOCKD *xd,
}
#else // CONFIG_EXT_REFS
#if CONFIG_BIDIR_PRED
vp
x
_write
(
w
,
bit_bwd
,
vp10_get_pred_prob_comp_bwdref_p
(
cm
,
xd
));
vp
10
_write
(
w
,
bit_bwd
,
vp10_get_pred_prob_comp_bwdref_p
(
cm
,
xd
));
#endif // CONFIG_BIDIR_PRED
#endif // CONFIG_EXT_REFS
}
else
{
...
...
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