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
32d8a496
Commit
32d8a496
authored
Oct 21, 2016
by
Yaowu Xu
Committed by
Gerrit Code Review
Oct 21, 2016
Browse files
Merge "Code class0 using aom_read() / aom_write()." into nextgenv2
parents
f29166de
45ea963f
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodemv.c
View file @
32d8a496
...
...
@@ -746,7 +746,7 @@ static int read_mv_component(aom_reader *r, const nmv_component *mvcomp,
// Integer part
if
(
class0
)
{
d
=
aom_read
_tree
(
r
,
av1_mv_class0_tree
,
mvcomp
->
class0
,
ACCT_STR
);
d
=
aom_read
(
r
,
mvcomp
->
class0
[
0
]
,
ACCT_STR
);
mag
=
0
;
}
else
{
int
i
;
...
...
av1/encoder/encodemv.c
View file @
32d8a496
...
...
@@ -23,12 +23,10 @@
static
struct
av1_token
mv_joint_encodings
[
MV_JOINTS
];
static
struct
av1_token
mv_class_encodings
[
MV_CLASSES
];
static
struct
av1_token
mv_fp_encodings
[
MV_FP_SIZE
];
static
struct
av1_token
mv_class0_encodings
[
CLASS0_SIZE
];
void
av1_entropy_mv_init
(
void
)
{
av1_tokens_from_tree
(
mv_joint_encodings
,
av1_mv_joint_tree
);
av1_tokens_from_tree
(
mv_class_encodings
,
av1_mv_class_tree
);
av1_tokens_from_tree
(
mv_class0_encodings
,
av1_mv_class0_tree
);
av1_tokens_from_tree
(
mv_fp_encodings
,
av1_mv_fp_tree
);
}
...
...
@@ -53,8 +51,7 @@ static void encode_mv_component(aom_writer *w, int comp,
// Integer bits
if
(
mv_class
==
MV_CLASS_0
)
{
av1_write_token
(
w
,
av1_mv_class0_tree
,
mvcomp
->
class0
,
&
mv_class0_encodings
[
d
]);
aom_write
(
w
,
d
,
mvcomp
->
class0
[
0
]);
}
else
{
int
i
;
const
int
n
=
mv_class
+
CLASS0_BITS
-
1
;
// number of bits
...
...
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