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
b1781b48
Commit
b1781b48
authored
Dec 07, 2011
by
Yaowu Xu
Committed by
On2 (Google) Code Review
Dec 07, 2011
Browse files
Merge "corrected an enum name" into experimental
parents
0072b8bc
0404a5a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp8/common/findnearmv.c
View file @
b1781b48
...
...
@@ -174,7 +174,7 @@ void vp8_find_near_mvs
int_mv
near_mvs
[
4
];
int_mv
*
mv
=
near_mvs
;
int
*
cntx
=
cnt
;
enum
{
CNT_
INTRA
,
CNT_NEAREST
,
CNT_NEAR
,
CNT_SPLITMV
};
enum
{
CNT_
ZEROMV
,
CNT_NEAREST
,
CNT_NEAR
,
CNT_SPLITMV
};
/* Zero accumulators */
mv
[
0
].
as_int
=
mv
[
1
].
as_int
=
mv
[
2
].
as_int
=
0
;
...
...
@@ -213,7 +213,7 @@ void vp8_find_near_mvs
*
cntx
+=
2
;
}
else
cnt
[
CNT_
INTRA
]
+=
2
;
cnt
[
CNT_
ZEROMV
]
+=
2
;
}
/* Process above left */
if
(
aboveleft
->
mbmi
.
ref_frame
!=
INTRA_FRAME
)
...
...
@@ -235,7 +235,7 @@ void vp8_find_near_mvs
*
cntx
+=
1
;
}
else
cnt
[
CNT_
INTRA
]
+=
1
;
cnt
[
CNT_
ZEROMV
]
+=
1
;
}
/* If we have three distinct MV's ... */
...
...
@@ -263,8 +263,8 @@ void vp8_find_near_mvs
}
/* Use near_mvs[0] to store the "best" MV */
if
(
cnt
[
CNT_NEAREST
]
>=
cnt
[
CNT_
INTRA
])
near_mvs
[
CNT_
INTRA
]
=
near_mvs
[
CNT_NEAREST
];
if
(
cnt
[
CNT_NEAREST
]
>=
cnt
[
CNT_
ZEROMV
])
near_mvs
[
CNT_
ZEROMV
]
=
near_mvs
[
CNT_NEAREST
];
/* Set up return values */
best_mv
->
as_int
=
near_mvs
[
0
].
as_int
;
...
...
@@ -286,8 +286,6 @@ vp8_prob *vp8_mv_ref_probs(
p
[
1
]
=
vp8_mode_contexts
[
near_mv_ref_ct
[
1
]]
[
1
];
p
[
2
]
=
vp8_mode_contexts
[
near_mv_ref_ct
[
2
]]
[
2
];
p
[
3
]
=
vp8_mode_contexts
[
near_mv_ref_ct
[
3
]]
[
3
];
/*p[3] = vp8_mode_contexts [near_mv_ref_ct[1]
+ near_mv_ref_ct[2] + near_mv_ref_ct[3]] [3];*/
return
p
;
}
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