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
a39321f3
Commit
a39321f3
authored
May 24, 2011
by
Scott LaVarnway
Browse files
Use int_mv instead of MV in vp8_mv_cont
Less operations. Change-Id: Ibb9cd5ae66b8c7c681c9a654d551c8729c31c3ae
parent
cfab2cae
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp8/common/entropymode.c
View file @
a39321f3
...
@@ -33,11 +33,11 @@ typedef enum
...
@@ -33,11 +33,11 @@ typedef enum
SUBMVREF_LEFT_ABOVE_ZED
SUBMVREF_LEFT_ABOVE_ZED
}
sumvfref_t
;
}
sumvfref_t
;
int
vp8_mv_cont
(
const
MV
*
l
,
const
MV
*
a
)
int
vp8_mv_cont
(
const
int_mv
*
l
,
const
int_mv
*
a
)
{
{
int
lez
=
(
l
->
row
==
0
&&
l
->
col
==
0
);
int
lez
=
(
l
->
as_int
==
0
);
int
aez
=
(
a
->
row
==
0
&&
a
->
col
==
0
);
int
aez
=
(
a
->
as_int
==
0
);
int
lea
=
(
l
->
row
==
a
->
row
&&
l
->
col
==
a
->
col
);
int
lea
=
(
l
->
as_int
==
a
->
as_int
);
if
(
lea
&&
lez
)
if
(
lea
&&
lez
)
return
SUBMVREF_LEFT_ABOVE_ZED
;
return
SUBMVREF_LEFT_ABOVE_ZED
;
...
...
vp8/common/entropymode.h
View file @
a39321f3
...
@@ -25,7 +25,7 @@ extern const int vp8_mbsplit_count [VP8_NUMMBSPLITS]; /* # of subsets */
...
@@ -25,7 +25,7 @@ extern const int vp8_mbsplit_count [VP8_NUMMBSPLITS]; /* # of subsets */
extern
const
vp8_prob
vp8_mbsplit_probs
[
VP8_NUMMBSPLITS
-
1
];
extern
const
vp8_prob
vp8_mbsplit_probs
[
VP8_NUMMBSPLITS
-
1
];
extern
int
vp8_mv_cont
(
const
MV
*
l
,
const
MV
*
a
);
extern
int
vp8_mv_cont
(
const
int_mv
*
l
,
const
int_mv
*
a
);
#define SUBMVREF_COUNT 5
#define SUBMVREF_COUNT 5
extern
const
vp8_prob
vp8_sub_mv_ref_prob2
[
SUBMVREF_COUNT
][
VP8_SUBMVREFS
-
1
];
extern
const
vp8_prob
vp8_sub_mv_ref_prob2
[
SUBMVREF_COUNT
][
VP8_SUBMVREFS
-
1
];
...
...
vp8/decoder/decodemv.c
View file @
a39321f3
...
@@ -362,7 +362,7 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
...
@@ -362,7 +362,7 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
leftmv
.
as_int
=
left_block_mv
(
mi
,
k
);
leftmv
.
as_int
=
left_block_mv
(
mi
,
k
);
abovemv
.
as_int
=
above_block_mv
(
mi
,
k
,
mis
);
abovemv
.
as_int
=
above_block_mv
(
mi
,
k
,
mis
);
mv_contz
=
vp8_mv_cont
(
&
(
leftmv
.
as_mv
)
,
&
(
abovemv
.
as_mv
)
);
mv_contz
=
vp8_mv_cont
(
&
leftmv
,
&
abovemv
);
switch
(
bmi
.
mode
=
(
B_PREDICTION_MODE
)
sub_mv_ref
(
bc
,
vp8_sub_mv_ref_prob2
[
mv_contz
]))
/*pc->fc.sub_mv_ref_prob))*/
switch
(
bmi
.
mode
=
(
B_PREDICTION_MODE
)
sub_mv_ref
(
bc
,
vp8_sub_mv_ref_prob2
[
mv_contz
]))
/*pc->fc.sub_mv_ref_prob))*/
{
{
...
...
vp8/encoder/bitstream.c
View file @
a39321f3
...
@@ -1023,7 +1023,7 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
...
@@ -1023,7 +1023,7 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
assert
(
0
);
assert
(
0
);
leftmv
.
as_int
=
left_block_mv
(
m
,
k
);
leftmv
.
as_int
=
left_block_mv
(
m
,
k
);
abovemv
.
as_int
=
above_block_mv
(
m
,
k
,
mis
);
abovemv
.
as_int
=
above_block_mv
(
m
,
k
,
mis
);
mv_contz
=
vp8_mv_cont
(
&
(
leftmv
.
as_mv
)
,
&
(
abovemv
.
as_mv
)
);
mv_contz
=
vp8_mv_cont
(
&
leftmv
,
&
abovemv
);
write_sub_mv_ref
(
w
,
b
->
mode
,
vp8_sub_mv_ref_prob2
[
mv_contz
]);
//pc->fc.sub_mv_ref_prob);
write_sub_mv_ref
(
w
,
b
->
mode
,
vp8_sub_mv_ref_prob2
[
mv_contz
]);
//pc->fc.sub_mv_ref_prob);
...
...
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