Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: source/libvpx/vp8/common/findnearmv.c

Issue 7671004: Update libvpx snapshot to v0.9.7-p1 (Cayuga). (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vp8/common/findnearmv.h ('k') | source/libvpx/vp8/common/generic/systemdependent.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vp8/common/findnearmv.c
===================================================================
--- source/libvpx/vp8/common/findnearmv.c (revision 96967)
+++ source/libvpx/vp8/common/findnearmv.c (working copy)
@@ -25,9 +25,9 @@
(
MACROBLOCKD *xd,
const MODE_INFO *here,
- MV *nearest,
- MV *nearby,
- MV *best_mv,
+ int_mv *nearest,
+ int_mv *nearby,
+ int_mv *best_mv,
int cnt[4],
int refframe,
int *ref_frame_sign_bias
@@ -131,13 +131,14 @@
near_mvs[CNT_INTRA] = near_mvs[CNT_NEAREST];
/* Set up return values */
- *best_mv = near_mvs[0].as_mv;
- *nearest = near_mvs[CNT_NEAREST].as_mv;
- *nearby = near_mvs[CNT_NEAR].as_mv;
+ best_mv->as_int = near_mvs[0].as_int;
+ nearest->as_int = near_mvs[CNT_NEAREST].as_int;
+ nearby->as_int = near_mvs[CNT_NEAR].as_int;
- vp8_clamp_mv(nearest, xd);
- vp8_clamp_mv(nearby, xd);
- vp8_clamp_mv(best_mv, xd); /*TODO: move this up before the copy*/
+ //TODO: move clamp outside findnearmv
+ vp8_clamp_mv2(nearest, xd);
+ vp8_clamp_mv2(nearby, xd);
+ vp8_clamp_mv2(best_mv, xd);
}
vp8_prob *vp8_mv_ref_probs(
@@ -152,26 +153,3 @@
return p;
}
-const B_MODE_INFO *vp8_left_bmi(const MODE_INFO *cur_mb, int b)
-{
- if (!(b & 3))
- {
- /* On L edge, get from MB to left of us */
- --cur_mb;
- b += 4;
- }
-
- return cur_mb->bmi + b - 1;
-}
-
-const B_MODE_INFO *vp8_above_bmi(const MODE_INFO *cur_mb, int b, int mi_stride)
-{
- if (!(b >> 2))
- {
- /* On top edge, get from MB above us */
- cur_mb -= mi_stride;
- b += 16;
- }
-
- return cur_mb->bmi + b - 4;
-}
« no previous file with comments | « source/libvpx/vp8/common/findnearmv.h ('k') | source/libvpx/vp8/common/generic/systemdependent.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698