diff options
author | Jingning Han <jingning@google.com> | 2014-10-28 12:00:13 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-28 12:00:13 -0700 |
commit | 982dab605039e0fab89ed8e7df0184463bd9b5eb (patch) | |
tree | d9bbef046b68c22b9f16d4858f439c5c28ded101 /vp9 | |
parent | 50e5c305365f79159f2836935f83df1181670723 (diff) | |
parent | 07436abb86b3e2a981d563ecd628c1781004ebb7 (diff) | |
download | libvpx-982dab605039e0fab89ed8e7df0184463bd9b5eb.tar libvpx-982dab605039e0fab89ed8e7df0184463bd9b5eb.tar.gz libvpx-982dab605039e0fab89ed8e7df0184463bd9b5eb.tar.bz2 libvpx-982dab605039e0fab89ed8e7df0184463bd9b5eb.zip |
Merge "Use zero motion vector in choose_partitioning"
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 18a091220..baa4908d4 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -467,7 +467,6 @@ static void choose_partitioning(VP9_COMP *cpi, int sp; int dp; int pixels_wide = 64, pixels_high = 64; - int_mv nearest_mv, near_mv; const YV12_BUFFER_CONFIG *yv12 = get_ref_frame_buffer(cpi, LAST_FRAME); const struct scale_factors *const sf = &cm->frame_refs[LAST_FRAME - 1].sf; @@ -488,11 +487,7 @@ static void choose_partitioning(VP9_COMP *cpi, xd->mi[0].src_mi->mbmi.ref_frame[0] = LAST_FRAME; xd->mi[0].src_mi->mbmi.sb_type = BLOCK_64X64; - vp9_find_best_ref_mvs(xd, cm->allow_high_precision_mv, - xd->mi[0].src_mi->mbmi.ref_mvs[LAST_FRAME], - &nearest_mv, &near_mv); - - xd->mi[0].src_mi->mbmi.mv[0] = nearest_mv; + xd->mi[0].src_mi->mbmi.mv[0].as_int = 0; vp9_build_inter_predictors_sby(xd, mi_row, mi_col, BLOCK_64X64); d = xd->plane[0].dst.buf; |