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

Unified Diff: source/libvpx/vp9/encoder/vp9_temporal_filter.c

Issue 23600008: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 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/vp9/encoder/vp9_segmentation.c ('k') | source/libvpx/vp9/encoder/vp9_tokenize.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vp9/encoder/vp9_temporal_filter.c
===================================================================
--- source/libvpx/vp9/encoder/vp9_temporal_filter.c (revision 219822)
+++ source/libvpx/vp9/encoder/vp9_temporal_filter.c (working copy)
@@ -40,11 +40,8 @@
int mv_col,
uint8_t *pred) {
const int which_mv = 0;
- int_mv mv;
+ MV mv = { mv_row, mv_col };
- mv.as_mv.row = mv_row;
- mv.as_mv.col = mv_col;
-
vp9_build_inter_predictor(y_mb_ptr, stride,
&pred[0], 16,
&mv,
@@ -157,10 +154,10 @@
// TODO Check that the 16x16 vf & sdf are selected here
// Ignore mv costing by sending NULL pointer instead of cost arrays
ref_mv = &x->e_mbd.mode_info_context->bmi[0].as_mv[0];
- bestsme = vp9_hex_search(x, &best_ref_mv1_full, ref_mv,
- step_param, sadpb, &cpi->fn_ptr[BLOCK_16X16],
- NULL, NULL, NULL, NULL,
- &best_ref_mv1);
+ bestsme = vp9_hex_search(x, &best_ref_mv1_full,
+ step_param, sadpb, 1,
+ &cpi->fn_ptr[BLOCK_16X16],
+ 0, &best_ref_mv1, ref_mv);
#if ALT_REF_SUBPEL_ENABLED
// Try sub-pixel MC?
@@ -173,6 +170,7 @@
&best_ref_mv1,
x->errorperbit,
&cpi->fn_ptr[BLOCK_16X16],
+ 0, cpi->sf.subpel_iters_per_step,
NULL, NULL,
&distortion, &sse);
}
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_segmentation.c ('k') | source/libvpx/vp9/encoder/vp9_tokenize.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698